Show correct version number in squid.conf.default

diff --git a/src/Makefile.am b/src/Makefile.am
index 4a667fec49478a82dc3777ab711b9358a176cb56..e360daa005e649795af2123d8f2d6b04dfd28ca7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.66 2003/03/11 22:11:38 robertc Exp $
+#  $Id: Makefile.am,v 1.67 2003/03/13 07:39:53 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -725,7 +725,8 @@ cf.data: cf.data.pre Makefile
        s%@DEFAULT_MIB_PATH@%$(DEFAULT_MIB_PATH)%g;\
        s%@DEFAULT_ERROR_DIR@%$(DEFAULT_ERROR_DIR)%g;\
        s%@DEFAULT_PREFIX@%$(DEFAULT_PREFIX)%g;\
-       s%@DEFAULT_HOSTS@%$(DEFAULT_HOSTS)%g;"\
+       s%@DEFAULT_HOSTS@%$(DEFAULT_HOSTS)%g;\
+       s%@[V]ERSION@%$(VERSION)%g;"\
        < $(srcdir)/cf.data.pre >$@
 
 store_modules.cc: store_modules.sh Makefile

diff --git a/src/Makefile.in b/src/Makefile.in
index 811074c64835cb507949bf59e7fc6557a627b1aa..46e09cec022f5d762d5e321719be2a5f1980bf78 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.299 2003/03/11 22:14:12 robertc Exp $
+#  $Id: Makefile.in,v 1.300 2003/03/13 07:39:53 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -1788,7 +1788,8 @@ cf.data: cf.data.pre Makefile
        s%@DEFAULT_MIB_PATH@%$(DEFAULT_MIB_PATH)%g;\
        s%@DEFAULT_ERROR_DIR@%$(DEFAULT_ERROR_DIR)%g;\
        s%@DEFAULT_PREFIX@%$(DEFAULT_PREFIX)%g;\
-       s%@DEFAULT_HOSTS@%$(DEFAULT_HOSTS)%g;"\
+       s%@DEFAULT_HOSTS@%$(DEFAULT_HOSTS)%g;\
+       s%@[V]ERSION@%$(VERSION)%g;"\
        < $(srcdir)/cf.data.pre >$@
 
 store_modules.cc: store_modules.sh Makefile

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 2b300f1b872996914d81a0eaba22982b423a0ee6..4d09dae8d22e8b84e10abba244c844c310d327bd 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.307 2003/03/10 04:56:36 robertc Exp $
+# $Id: cf.data.pre,v 1.308 2003/03/13 07:39:54 hno Exp $
 #
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -31,8 +31,8 @@
 #
 
 COMMENT_START
-       WELCOME TO SQUID 2
-       ------------------
+       WELCOME TO SQUID @VERSION@
+       ----------------------------
 
        This is the default Squid configuration file. You may wish
        to look at the Squid home page (http://www.squid-cache.org/)