Update cf.data sed pattern

diff --git a/src/Makefile.am b/src/Makefile.am
index ce1799199f4b3541f762ff48f1b6dd21d9d2ada2..0840610fd6787664a0a28cb418ce7f95c83f5177 100644 (file)
--- 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 bafb2e1285d9479905f825968ee7821de50b15b7..1b52c836800c8a0cbaef344801fe076e518c83de 100644 (file)
--- 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