From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Sat, 21 Nov 2009 22:16:31 +0000 (+0100)
Subject: FreeBSD for some reason some times do not like our big cf.data script
X-Git-Tag: SQUID_3_2_0_1~542
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c2cec784180ef3ebede43563804b706f329f91a;p=thirdparty%2Fsquid.git

FreeBSD for some reason some times do not like our big cf.data script

Split in multiple expressions specified by -e arguments. Seems to work better.

The large blob had a bit of extra space characters in it from the line folding
which seems to be related to the failure. (each command began with a space)
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 916e8e1e8e..baa764c31c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -789,27 +789,27 @@ cf_gen_defines.h: $(srcdir)/cf_gen_defines $(srcdir)/cf.data.pre
 ## FIXME: generate a sed command file from configure. Then this doesn't
 ## depend on the Makefile.
 cf.data: cf.data.pre Makefile
-	sed "\
-	s%[@]DEFAULT_HTTP_PORT[@]%$(DEFAULT_HTTP_PORT)%g;\
-	s%[@]DEFAULT_ICP_PORT[@]%$(DEFAULT_ICP_PORT)%g;\
-	s%[@]DEFAULT_CACHE_EFFECTIVE_USER[@]%${CACHE_EFFECTIVE_USER}%g;\
-	s%[@]DEFAULT_MIME_TABLE[@]%$(DEFAULT_MIME_TABLE)%g;\
-	s%[@]DEFAULT_DNSSERVER[@]%$(DEFAULT_DNSSERVER)%g;\
-	s%[@]DEFAULT_UNLINKD[@]%$(DEFAULT_UNLINKD)%g;\
-	s%[@]DEFAULT_PINGER[@]%$(DEFAULT_PINGER)%g;\
-	s%[@]DEFAULT_DISKD[@]%$(DEFAULT_DISKD)%g;\
-	s%[@]DEFAULT_CACHE_LOG[@]%$(DEFAULT_CACHE_LOG)%g;\
-	s%[@]DEFAULT_ACCESS_LOG[@]%$(DEFAULT_ACCESS_LOG)%g;\
-	s%[@]DEFAULT_STORE_LOG[@]%$(DEFAULT_STORE_LOG)%g;\
-	s%[@]DEFAULT_PID_FILE[@]%$(DEFAULT_PID_FILE)%g;\
-	s%[@]DEFAULT_NETDB_FILE[@]%$(DEFAULT_NETDB_FILE)%g;\
-	s%[@]DEFAULT_SWAP_DIR[@]%$(DEFAULT_SWAP_DIR)%g;\
-	s%[@]DEFAULT_ICON_DIR[@]%$(DEFAULT_ICON_DIR)%g;\
-	s%[@]DEFAULT_CONFIG_DIR[@]%$(DEFAULT_CONFIG_DIR)%g;\
-	s%[@]DEFAULT_PREFIX[@]%$(DEFAULT_PREFIX)%g;\
-	s%[@]DEFAULT_HOSTS[@]%$(DEFAULT_HOSTS)%g;\
-	s%[@]IPV6_ONLY_SETTING[@]%$(SET_IPV6_SETTINGS)%g;\
-	s%[@]SQUID[@]%SQUID\ $(VERSION)%g;"\
+	sed \
+	-e "s%[@]DEFAULT_HTTP_PORT[@]%$(DEFAULT_HTTP_PORT)%g" \
+	-e "s%[@]DEFAULT_ICP_PORT[@]%$(DEFAULT_ICP_PORT)%g" \
+	-e "s%[@]DEFAULT_CACHE_EFFECTIVE_USER[@]%${CACHE_EFFECTIVE_USER}%g" \
+	-e "s%[@]DEFAULT_MIME_TABLE[@]%$(DEFAULT_MIME_TABLE)%g" \
+	-e "s%[@]DEFAULT_DNSSERVER[@]%$(DEFAULT_DNSSERVER)%g" \
+	-e "s%[@]DEFAULT_UNLINKD[@]%$(DEFAULT_UNLINKD)%g" \
+	-e "s%[@]DEFAULT_PINGER[@]%$(DEFAULT_PINGER)%g" \
+	-e "s%[@]DEFAULT_DISKD[@]%$(DEFAULT_DISKD)%g" \
+	-e "s%[@]DEFAULT_CACHE_LOG[@]%$(DEFAULT_CACHE_LOG)%g" \
+	-e "s%[@]DEFAULT_ACCESS_LOG[@]%$(DEFAULT_ACCESS_LOG)%g" \
+	-e "s%[@]DEFAULT_STORE_LOG[@]%$(DEFAULT_STORE_LOG)%g" \
+	-e "s%[@]DEFAULT_PID_FILE[@]%$(DEFAULT_PID_FILE)%g" \
+	-e "s%[@]DEFAULT_NETDB_FILE[@]%$(DEFAULT_NETDB_FILE)%g" \
+	-e "s%[@]DEFAULT_SWAP_DIR[@]%$(DEFAULT_SWAP_DIR)%g" \
+	-e "s%[@]DEFAULT_ICON_DIR[@]%$(DEFAULT_ICON_DIR)%g" \
+	-e "s%[@]DEFAULT_CONFIG_DIR[@]%$(DEFAULT_CONFIG_DIR)%g" \
+	-e "s%[@]DEFAULT_PREFIX[@]%$(DEFAULT_PREFIX)%g" \
+	-e "s%[@]DEFAULT_HOSTS[@]%$(DEFAULT_HOSTS)%g" \
+	-e "s%[@]IPV6_ONLY_SETTING[@]%$(SET_IPV6_SETTINGS)%g" \
+	-e "s%[@]SQUID[@]%SQUID\ $(VERSION)%g" \
 	< $(srcdir)/cf.data.pre >$@
 
 repl_modules.cc: repl_modules.sh Makefile