From: hno <>
Date: Thu, 13 Mar 2003 14:39:53 +0000 (+0000)
Subject: Show correct version number in squid.conf.default
X-Git-Tag: SQUID_3_0_PRE1~263
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=835fccdfbe1cfa9d6235b18dc81facc5ebba615a;p=thirdparty%2Fsquid.git

Show correct version number in squid.conf.default
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 4a667fec49..e360daa005 100644
--- 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 811074c648..46e09cec02 100644
--- 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 2b300f1b87..4d09dae8d2 100644
--- 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/)