Fixed the use of --xattrs with --only-write-batch.

[rsync/rsync.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 15315ea..2554885 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,7 +59,7 @@ CHECK_OBJS=tls.o getgroups.o getfsdev.o t_stub.o t_unsafe.o trimslash.o wildtest
        $(CC) -I. -I$(srcdir) $(CFLAGS) $(CPPFLAGS) -c $< @CC_SHOBJ_FLAG@
 @OBJ_RESTORE@
 
-all: conf_stop make_stop rsync$(EXEEXT) @MAKE_MAN@
+all: Makefile rsync$(EXEEXT) @MAKE_MAN@
 
 install: all
        -mkdir -p ${DESTDIR}${bindir}
@@ -123,25 +123,51 @@ gensend: gen
 conf:
        cd $(srcdir) && $(MAKE) -f prepare-source.mak conf
 
-conf_stop: configure.sh config.h.in
-
 configure.sh config.h.in: configure.in aclocal.m4
+       @if test -f configure.sh; then cp -p configure.sh configure.sh.old; else touch configure.sh.old; fi
+       @if test -f config.h.in; then cp -p config.h.in config.h.in.old; else touch config.h.in.old; fi
        autoconf -o configure.sh
        autoheader && touch config.h.in
-       @echo 'Configure files changed -- perhaps run:'
-       @echo '  make reconfigure'
-       @exit 1
+       @if diff configure.sh configure.sh.old >/dev/null 2>&1; then \
+           echo "configure.sh is unchanged."; \
+           rm configure.sh.old; \
+       else \
+           echo "configure.sh has CHANGED."; \
+       fi
+       @if diff config.h.in config.h.in.old >/dev/null 2>&1; then \
+           echo "config.h.in is unchanged."; \
+           rm config.h.in.old; \
+       else \
+           echo "config.h.in has CHANGED."; \
+       fi
+       @if test -f configure.sh.old -o -f config.h.in.old; then \
+           if test "$(MAKECMDGOALS)" = reconfigure; then \
+               echo 'Continuing with "make reconfigure".'; \
+           else \
+               echo 'You may need to run:'; \
+               echo '  make reconfigure'; \
+               exit 1; \
+           fi \
+       fi
 
 reconfigure: configure.sh
        ./config.status --recheck
        ./config.status
 
-make_stop: Makefile
-
-Makefile: Makefile.in config.status
+Makefile: Makefile.in config.status configure.sh config.h.in
+       @if test -f Makefile; then cp -p Makefile Makefile.old; else touch Makefile.old; fi
        @./config.status
-       @echo "Makefile updated -- rerun your make command."
-       @exit 1
+       @if diff Makefile Makefile.old >/dev/null 2>&1; then \
+           echo "Makefile is unchanged."; \
+           rm Makefile.old; \
+       else \
+           if test "$(MAKECMDGOALS)" = reconfigure; then \
+               echo 'Continuing with "make reconfigure".'; \
+           else \
+               echo "Makefile updated -- rerun your make command."; \
+               exit 1; \
+           fi \
+       fi
 
 proto: proto.h-tstamp
 
@@ -165,7 +191,7 @@ rsyncd.conf.5: rsyncd.conf.yo
 
 clean: cleantests
        rm -f *~ $(OBJS) $(CHECK_PROGS) $(CHECK_OBJS) $(CHECK_SYMLINKS) \
-               rounding rounding.h
+               rounding rounding.h *.old
 
 cleantests:
        rm -rf ./testtmp*