* src/Makefile.in: Change build dir squid.conf to squid.conf.default - it is more...

	* src/cf_gen.c: Ditto.

diff --git a/src/Makefile.in b/src/Makefile.in
index da283fd8d5db33e98ccb6a3cd0c1b253f259cafc..8b51676d1f85553c1a84f35e87d235434837a76d 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.202 2001/05/05 17:49:54 hno Exp $
+#  $Id: Makefile.in,v 1.203 2001/08/19 03:49:38 robertc Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -206,7 +206,7 @@ SSL_OBJS    = ssl_support.o
 DEFAULTS        = \
        -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
 
-all:    squid.conf
+all:    squid.conf.default
        @for dir in $(SUBDIRS); do \
                echo "Making $@ in $$dir..."; \
                (cd $$dir ; $(MAKE) $(MFLAGS) prefix="$(prefix)" $@) || exit 1; \
@@ -255,8 +255,8 @@ test_cache_digest: test_cache_digest.o CacheDigest.o debug.o globals.o store_key
 
 cache_cf.o: cf_parser.c
 
-squid.conf: cf_parser.c
-       @sh -c "test -f squid.conf || ./cf_gen cf.data"
+squid.conf.default: cf_parser.c
+       @sh -c "test -f squid.conf.default || ./cf_gen cf.data"
 
 cf_parser.c: cf.data cf_gen
        ./cf_gen cf.data
@@ -393,12 +393,12 @@ install: all install-mkdirs
                fi; \
        done
        $(INSTALL_FILE) $(srcdir)/mib.txt $(DEFAULT_MIB_PATH)
-       $(INSTALL_FILE) squid.conf $(sysconfdir)/squid.conf.default
+       $(INSTALL_FILE) squid.conf.default $(sysconfdir)/squid.conf.default
        @if test -f $(sysconfdir)/squid.conf ; then \
                echo "$@ will not overwrite existing $(sysconfdir)/squid.conf" ; \
        else \
-               echo "$(INSTALL_FILE) squid.conf $(sysconfdir)"; \
-               $(INSTALL_FILE) squid.conf $(sysconfdir); \
+               echo "$(INSTALL_FILE) squid.conf.default $(sysconfdir)"; \
+               $(INSTALL_FILE) squid.conf.default $(sysconfdir); \
        fi
 
        $(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir)/mime.conf.default
@@ -425,7 +425,7 @@ install-pinger:
 clean: 
        -rm -rf *.o *pure_* core $(PROGS) $(UTILS) $(CGIPROGS) $(SUID_UTILS)
        -rm -f cf_gen cf_gen_defines.h cf_parser.c cf.data globals.c string_arrays.c
-       -rm -f store_modules.c repl_modules.c auth_modules.c squid.conf
+       -rm -f store_modules.c repl_modules.c auth_modules.c squid.conf.default
        @for dir in $(SUBDIRS); do \
                echo "Making $@ in $$dir..."; \
                (cd $$dir ; $(MAKE) $(MFLAGS) prefix="$(prefix)" $@) || exit 1; \

diff --git a/src/cf_gen.cc b/src/cf_gen.cc
index ef8443691f39e19be0759285aae7f2185051196c..82c434baa0ed80f8f4d0602f96fdc9ee6f21da73 100644 (file)
--- a/src/cf_gen.cc
+++ b/src/cf_gen.cc
@@ -1,8 +1,8 @@
 
 /*
- * $Id: cf_gen.cc,v 1.40 2001/01/12 00:37:15 wessels Exp $
+ * $Id: cf_gen.cc,v 1.41 2001/08/19 03:49:38 robertc Exp $
  *
- * DEBUG: none          Generate squid.conf and cf_parser.c
+ * DEBUG: none          Generate squid.conf.default and cf_parser.c
  * AUTHOR: Max Okumoto
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -36,15 +36,15 @@
 /*****************************************************************************
  * Abstract:   This program parses the input file and generates code and
  *             files used to configure the variables in squid.
- *             (ie it creates the squid.conf file from the cf.data file)
+ *             (ie it creates the squid.conf.default file from the cf.data file)
  *
  *             The output files are as follows:
  *             cf_parser.c - this file contains, default_all() which
  *                       initializes variables with the default
  *                       values, parse_line() that parses line from
- *                       squid.conf, dump_config that dumps the
+ *                       squid.conf.default, dump_config that dumps the
  *                       current the values of the variables.
- *             squid.conf - default configuration file given to the server
+ *             squid.conf.default - default configuration file given to the server
  *                      administrator.
  *****************************************************************************/
 
@@ -77,7 +77,7 @@
 
 #define MAX_LINE       1024    /* longest configuration line */
 #define _PATH_PARSER           "cf_parser.c"
-#define _PATH_SQUID_CONF       "squid.conf"
+#define _PATH_SQUID_CONF       "squid.conf.default"
 
 enum State {
     sSTART,
@@ -325,7 +325,7 @@ main(int argc, char *argv[])
      * Generate parse_line()
      * Generate dump_config()
      * Generate free_all()
-     * Generate example squid.conf file
+     * Generate example squid.conf.default file
      *-------------------------------------------------------------------*/
 
     /* Open output x.c file */