From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 5 Oct 2009 10:33:08 +0000 (+1300)
Subject: Update cf.data sed pattern
X-Git-Tag: SQUID_3_2_0_1~665
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad12fb4bdc9cc21fe61b7d6fb0b0705beff45c58;p=thirdparty%2Fsquid.git

Update cf.data sed pattern
---

diff --git a/src/Makefile.am b/src/Makefile.am
index ce1799199f..0840610fd6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -800,11 +800,10 @@ cf.data: cf.data.pre Makefile
 	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_ERROR_DIR@%$(DEFAULT_ERROR_DIR)%g;\
 	s%@DEFAULT_CONFIG_DIR@%$(DEFAULT_CONFIG_DIR)%g;\
 	s%@DEFAULT_PREFIX@%$(DEFAULT_PREFIX)%g;\
 	s%@DEFAULT_HOSTS@%$(DEFAULT_HOSTS)%g;\
-	s%@[V]ERSION@%$(VERSION)%g;"\
+	s%@SQUID@%SQUID\ $(VERSION)%g;"\
 	< $(srcdir)/cf.data.pre >$@
 
 repl_modules.cc: repl_modules.sh Makefile
diff --git a/src/cf.data.pre b/src/cf.data.pre
index bafb2e1285..1b52c83680 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -27,7 +27,7 @@
 #
 
 COMMENT_START
-	WELCOME TO SQUID @VERSION@
+	WELCOME TO @SQUID@
 	----------------------------
 
 	This is the default Squid configuration file. You may wish