Author: Henrik Nordstrom <henrik@henriknordstrom.net>

Remove unused DEFAULT_MIB_PATH variable

diff --git a/src/Makefile.am b/src/Makefile.am
index 45e59ce6abf8b36014b72aeed8e31c2fdb2a972e..39d8006f3ec33d749d3a674d63239d66835894f8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -719,7 +719,6 @@ DEFAULT_UNLINKD             = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT
 DEFAULT_DISKD          = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_ICON_DIR       = $(datadir)/icons
 DEFAULT_ERROR_DIR      = $(datadir)/errors
-DEFAULT_MIB_PATH       = $(datadir)/mib.txt
 DEFAULT_HOSTS          = @OPT_DEFAULT_HOSTS@
 
 # Make location configure settings available to the code
@@ -775,12 +774,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_MIB_PATH@%$(DEFAULT_MIB_PATH)%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 6b01717266df9d175d383727b44ecc35b72bc8f1..5ebf10ad0a425f919f2c92ae913c411c1d0e1350 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