From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 1 Aug 2012 12:37:25 +0000 (+1200)
Subject: Release notes: build SPONSORS.txt in bootstrap instead of automake
X-Git-Tag: sourceformat-review-1~144
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=957eb8d1af7198e108c4d9b517a0f98f91f832e4;p=thirdparty%2Fsquid.git

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

diff --git a/Makefile.am b/Makefile.am
index 20a944415c..62c0a00f74 100644
--- 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 0bebfe9e84..6405653070 100755
--- 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.