Temporary changes to have the build-farm configure and build

the ACL version of rsync (patched in via patches/acls.diff).

diff --git a/Makefile.in b/Makefile.in
index ecbb1b4..7eb0140 100644 (file)
--- 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: rsync$(EXEEXT)
+all: proto rsync$(EXEEXT)
 
 install: all
        -mkdir -p ${DESTDIR}${bindir}
@@ -102,6 +102,11 @@ proto:
 
 clean: cleantests
        rm -f *~ $(OBJS) $(TLS_OBJ) $(CHECK_PROGS) $(CHECK_OBJS)
+       cd $(srcdir)
+       [ -f acls.c ] && patch -p1 -R <patches/acls.diff || true
+       rm -f *.orig *.rej */*.orig */*.rej
+       $(MAKE) -f prepare-source.mak proto.h
+       rm -f lib/sysacls.c lib/sysacls.h smb_acls.h acls.c
 
 cleantests:
        rm -rf ./testtmp*