Release notes: build SPONSORS.txt in bootstrap instead of automake

diff --git a/Makefile.am b/Makefile.am
index 20a944415cc09322a551d530321e24c609457d55..62c0a00f74fc9d9463f00b96df8dbce943e7a69f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ endif
 SUBDIRS += scripts icons errors doc helpers src tools test-suite
 
 DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
-DEFAULT_PINGER         = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
 
 dist-hook:
        @ for subdir in include; do \
@@ -47,9 +47,6 @@ EXTRA_DIST = \
        bootstrap.sh \
        po4a.conf
 
-SPONSORS.txt: SPONSORS
-       sed -e 's/@Squid-[0-9\.]*://' <$(top_srcdir)/SPONSORS > $@ || ($(RM) -f $@ && exit 1)
-
 install-pinger:
        chown root $(DESTDIR)$(DEFAULT_PINGER)
        chmod 4711 $(DESTDIR)$(DEFAULT_PINGER)

diff --git a/bootstrap.sh b/bootstrap.sh
index 0bebfe9e84a17bd09157e79cf0ebf1ea2c6c9683..64056530705c333dc280e08fee42d98813a3df36 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -148,6 +148,9 @@ do
     fi
 done
 
+# Make a copy of SPONSORS we can package
+sed -e 's/@Squid-[0-9\.]*://' <SPONSORS > SPONSORS.txt || (rm -f SPONSORS.txt && exit 1)
+
 # Fixup autoconf recursion using --silent/--quiet option
 # autoconf should inherit this option whe recursing into subdirectories
 # but it currently doesn't for some reason.