Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 1 | From 81700d1a0e51391028c761cc8ef1cd660084d114 Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 475cb72 | 2020-07-10 16:00:51 -0500 | [diff] [blame] | 2 | From: Ross Burton <ross.burton@intel.com> |
| 3 | Date: Tue, 12 Apr 2016 15:51:54 +0100 |
| 4 | Subject: [PATCH] rsync: remove upstream's rebuild logic |
| 5 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 6 | Remove the Makefile rules to reinvoke autoconf, they're not out-of-tree safe and |
| 7 | generally overcomplicated, and we ensure that autoreconf is invoked if required. |
| 8 | |
| 9 | Upstream-Status: Inappropriate |
| 10 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 11 | |
Andrew Geissler | 475cb72 | 2020-07-10 16:00:51 -0500 | [diff] [blame] | 12 | --- |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 13 | Makefile.in | 54 ----------------------------------------------------- |
| 14 | 1 file changed, 54 deletions(-) |
Andrew Geissler | 475cb72 | 2020-07-10 16:00:51 -0500 | [diff] [blame] | 15 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 16 | diff --git a/Makefile.in b/Makefile.in |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 17 | index 3cde955..d963a70 100644 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 18 | --- a/Makefile.in |
| 19 | +++ b/Makefile.in |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 20 | @@ -190,60 +190,6 @@ gensend: gen |
| 21 | fi |
| 22 | rsync -aic $(GENFILES) git-version.h $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/ || true |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 23 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 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 |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 44 | - @if test -f configure.sh.old || test -f config.h.in.old; then \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 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 | - |
Andrew Geissler | 475cb72 | 2020-07-10 16:00:51 -0500 | [diff] [blame] | 54 | -.PHONY: reconfigure |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 55 | -reconfigure: configure.sh |
| 56 | - ./config.status --recheck |
| 57 | - ./config.status |
| 58 | - |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 59 | -.PHONY: restatus |
| 60 | -restatus: |
| 61 | - ./config.status |
| 62 | - |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 63 | -Makefile: Makefile.in config.status configure.sh config.h.in |
| 64 | - @if test -f Makefile; then cp -p Makefile Makefile.old; else touch Makefile.old; fi |
| 65 | - @./config.status |
| 66 | - @if diff Makefile Makefile.old >/dev/null 2>&1; then \ |
| 67 | - echo "Makefile is unchanged."; \ |
| 68 | - rm Makefile.old; \ |
| 69 | - else \ |
| 70 | - if test "$(MAKECMDGOALS)" = reconfigure; then \ |
| 71 | - echo 'Continuing with "make reconfigure".'; \ |
| 72 | - else \ |
| 73 | - echo "Makefile updated -- rerun your make command."; \ |
| 74 | - exit 1; \ |
| 75 | - fi \ |
| 76 | - fi |
| 77 | - |
Andrew Geissler | 475cb72 | 2020-07-10 16:00:51 -0500 | [diff] [blame] | 78 | stunnel-rsyncd.conf: $(srcdir)/stunnel-rsyncd.conf.in Makefile |
| 79 | sed 's;\@bindir\@;$(bindir);g' <$(srcdir)/stunnel-rsyncd.conf.in >stunnel-rsyncd.conf |
| 80 | |