From b4768a139789cd837d0d948f26d65eee5a6a09bf Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Tue, 24 Oct 2006 15:09:57 +0000
Subject: [PATCH] Undo temporary changes used for build-farm testing of ACL
 patch.

---
 Makefile.in | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index bc931ca9..ecbb1b42 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,7 +56,7 @@ CHECK_OBJS=getgroups.o getfsdev.o t_stub.o t_unsafe.o trimslash.o wildtest.o
 	$(CC) -I. -I$(srcdir) $(CFLAGS) $(CPPFLAGS) -c $< @CC_SHOBJ_FLAG@
 @OBJ_RESTORE@
 
-all: proto rsync$(EXEEXT)
+all: rsync$(EXEEXT)
 
 install: all
 	-mkdir -p ${DESTDIR}${bindir}
@@ -100,13 +100,7 @@ man:
 proto:
 	cd $(srcdir) && $(MAKE) -f prepare-source.mak proto.h
 
-unpatch:
-	test -f $(srcdir)/acls.c && patch -td $(srcdir) -p1 -R <$(srcdir)/patches/acls.diff || true
-	rm -f $(srcdir)/lib/sysacls.? $(srcdir)/smb_acls.h $(srcdir)/acls.c
-	rm -f $(srcdir)/*.orig $(srcdir)/*.rej $(srcdir)/*/*.orig $(srcdir)/*/*.rej
-	rm -f $(srcdir)/testsuite/default-acls.test $(srcdir)/testsuite/acls.test
-
-clean: unpatch proto cleantests
+clean: cleantests
 	rm -f *~ $(OBJS) $(TLS_OBJ) $(CHECK_PROGS) $(CHECK_OBJS)
 
 cleantests:
-- 
2.34.1