blob: 0c9ce8b8e3d5663707902fcaef2af085c19936f1 [file] [log] [blame]
Patrick Williams44b3caf2024-04-12 16:51:14 -05001From f446686c26c499e15ef17d495a93cfbc20e16090 Mon Sep 17 00:00:00 2001
Andrew Geissler475cb722020-07-10 16:00:51 -05002From: Ross Burton <ross.burton@intel.com>
3Date: Tue, 12 Apr 2016 15:51:54 +0100
4Subject: [PATCH] rsync: remove upstream's rebuild logic
5
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05006Remove 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>
Andrew Geissler475cb722020-07-10 16:00:51 -050011---
Andrew Geissler635e0e42020-08-21 15:58:33 -050012 Makefile.in | 54 -----------------------------------------------------
13 1 file changed, 54 deletions(-)
Andrew Geissler475cb722020-07-10 16:00:51 -050014
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050015diff --git a/Makefile.in b/Makefile.in
Patrick Williams44b3caf2024-04-12 16:51:14 -050016index a1253e5..a084935 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050017--- a/Makefile.in
18+++ b/Makefile.in
Patrick Williams44b3caf2024-04-12 16:51:14 -050019@@ -192,60 +192,6 @@ gensend: gen
Andrew Geisslerd5838332022-05-27 11:33:10 -050020 fi
21 rsync -aic $(GENFILES) git-version.h $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/ || true
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050022
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050023-aclocal.m4: $(srcdir)/m4/*.m4
24- aclocal -I $(srcdir)/m4
25-
26-configure.sh config.h.in: configure.ac aclocal.m4
27- @if test -f configure.sh; then cp -p configure.sh configure.sh.old; else touch configure.sh.old; fi
28- @if test -f config.h.in; then cp -p config.h.in config.h.in.old; else touch config.h.in.old; fi
29- autoconf -o configure.sh
30- autoheader && touch config.h.in
31- @if diff configure.sh configure.sh.old >/dev/null 2>&1; then \
32- echo "configure.sh is unchanged."; \
33- rm configure.sh.old; \
34- else \
35- echo "configure.sh has CHANGED."; \
36- fi
37- @if diff config.h.in config.h.in.old >/dev/null 2>&1; then \
38- echo "config.h.in is unchanged."; \
39- rm config.h.in.old; \
40- else \
41- echo "config.h.in has CHANGED."; \
42- fi
Andrew Geisslerd5838332022-05-27 11:33:10 -050043- @if test -f configure.sh.old || test -f config.h.in.old; then \
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050044- if test "$(MAKECMDGOALS)" = reconfigure; then \
45- echo 'Continuing with "make reconfigure".'; \
46- else \
47- echo 'You may need to run:'; \
48- echo ' make reconfigure'; \
49- exit 1; \
50- fi \
51- fi
52-
Andrew Geissler475cb722020-07-10 16:00:51 -050053-.PHONY: reconfigure
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050054-reconfigure: configure.sh
55- ./config.status --recheck
56- ./config.status
57-
Andrew Geissler635e0e42020-08-21 15:58:33 -050058-.PHONY: restatus
59-restatus:
60- ./config.status
61-
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050062-Makefile: Makefile.in config.status configure.sh config.h.in
63- @if test -f Makefile; then cp -p Makefile Makefile.old; else touch Makefile.old; fi
64- @./config.status
65- @if diff Makefile Makefile.old >/dev/null 2>&1; then \
66- echo "Makefile is unchanged."; \
67- rm Makefile.old; \
68- else \
69- if test "$(MAKECMDGOALS)" = reconfigure; then \
70- echo 'Continuing with "make reconfigure".'; \
71- else \
72- echo "Makefile updated -- rerun your make command."; \
73- exit 1; \
74- fi \
75- fi
76-
Andrew Geissler475cb722020-07-10 16:00:51 -050077 stunnel-rsyncd.conf: $(srcdir)/stunnel-rsyncd.conf.in Makefile
78 sed 's;\@bindir\@;$(bindir);g' <$(srcdir)/stunnel-rsyncd.conf.in >stunnel-rsyncd.conf
79