1From 5ae38baadd40a996da3d19a147f37e7f1f3355bf Mon Sep 17 00:00:00 2001 2From: Ross Burton <ross.burton@intel.com> 3Date: Tue, 12 Apr 2016 15:51:54 +0100 4Subject: [PATCH] rsync: remove upstream's rebuild logic 5 6Remove the Makefile rules to reinvoke autoconf, they're not out-of-tree safe and 7generally overcomplicated, and we ensure that autoreconf is invoked if required. 8 9Upstream-Status: Inappropriate 10Signed-off-by: Ross Burton <ross.burton@intel.com> 11 12--- 13 Makefile.in | 50 -------------------------------------------------- 14 1 file changed, 50 deletions(-) 15 16diff --git a/Makefile.in b/Makefile.in 17index 31ddc43..41c9a93 100644 18--- a/Makefile.in 19+++ b/Makefile.in 20@@ -167,56 +167,6 @@ gen: conf proto.h man 21 gensend: gen 22 rsync -aic $(GENFILES) $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/ 23 24-aclocal.m4: $(srcdir)/m4/*.m4 25- aclocal -I $(srcdir)/m4 26- 27-configure.sh config.h.in: configure.ac aclocal.m4 28- @if test -f configure.sh; then cp -p configure.sh configure.sh.old; else touch configure.sh.old; fi 29- @if test -f config.h.in; then cp -p config.h.in config.h.in.old; else touch config.h.in.old; fi 30- autoconf -o configure.sh 31- autoheader && touch config.h.in 32- @if diff configure.sh configure.sh.old >/dev/null 2>&1; then \ 33- echo "configure.sh is unchanged."; \ 34- rm configure.sh.old; \ 35- else \ 36- echo "configure.sh has CHANGED."; \ 37- fi 38- @if diff config.h.in config.h.in.old >/dev/null 2>&1; then \ 39- echo "config.h.in is unchanged."; \ 40- rm config.h.in.old; \ 41- else \ 42- echo "config.h.in has CHANGED."; \ 43- fi 44- @if test -f configure.sh.old -o -f config.h.in.old; then \ 45- if test "$(MAKECMDGOALS)" = reconfigure; then \ 46- echo 'Continuing with "make reconfigure".'; \ 47- else \ 48- echo 'You may need to run:'; \ 49- echo ' make reconfigure'; \ 50- exit 1; \ 51- fi \ 52- fi 53- 54-.PHONY: reconfigure 55-reconfigure: configure.sh 56- ./config.status --recheck 57- ./config.status 58- 59-Makefile: Makefile.in config.status configure.sh config.h.in 60- @if test -f Makefile; then cp -p Makefile Makefile.old; else touch Makefile.old; fi 61- @./config.status 62- @if diff Makefile Makefile.old >/dev/null 2>&1; then \ 63- echo "Makefile is unchanged."; \ 64- rm Makefile.old; \ 65- else \ 66- if test "$(MAKECMDGOALS)" = reconfigure; then \ 67- echo 'Continuing with "make reconfigure".'; \ 68- else \ 69- echo "Makefile updated -- rerun your make command."; \ 70- exit 1; \ 71- fi \ 72- fi 73- 74 stunnel-rsyncd.conf: $(srcdir)/stunnel-rsyncd.conf.in Makefile 75 sed 's;\@bindir\@;$(bindir);g' <$(srcdir)/stunnel-rsyncd.conf.in >stunnel-rsyncd.conf 76 77