fix setting default SWAP_DIR

diff --git a/src/Makefile.in b/src/Makefile.in
index cc53b74347546ad2e7374625b6c90566d56ac333..832984ee7063042c341c43a6165b4dc29c908f53 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.21 1996/04/16 18:28:31 wessels Exp $
+#  $Id: Makefile.in,v 1.22 1996/04/16 20:53:32 wessels Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -56,7 +56,8 @@ DEFAULTS        = \
        -DDEFAULT_CACHE_LOG=\"$(prefix)/logs/cache.log\" \
        -DDEFAULT_ACCESS_LOG=\"$(prefix)/logs/access.log\" \
        -DDEFAULT_HIERARCHY_LOG=\"$(prefix)/logs/hierarchy.log\" \
-       -DDEFAULT_STORE_LOG=\"$(prefix)/logs/store.log\"
+       -DDEFAULT_STORE_LOG=\"$(prefix)/logs/store.log\" \
+       -DDEFAULT_SWAP_DIR=\"$(prefix)/cache\"
 
 all:   $(PROGS) $(UTILS) $(CGIPROGS)
 

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index b8d16f391ccafaa6cfb951d319b9cd857c247a8f..3686193d2ddf8d036626ef717bb680468caed9f8 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,4 +1,4 @@
-/* $Id: cache_cf.cc,v 1.48 1996/04/16 18:31:32 wessels Exp $ */
+/* $Id: cache_cf.cc,v 1.49 1996/04/16 20:53:33 wessels Exp $ */
 
 /* DEBUG: Section 3             cache_cf: Configuration file parsing */
 
@@ -174,6 +174,7 @@ int emulate_httpd_log = DefaultCommonLogFormat;             /* for fast access */
 time_t neighbor_timeout = DefaultNeighborTimeout;      /* for fast access */
 int single_parent_bypass = 0;
 int DnsPositiveTtl = DefaultPositiveDnsTtl;
+char *DefaultSwapDir = DEFAULT_SWAP_DIR;
 char *config_file = DEFAULT_CONFIG_FILE;
 char *cfg_filename = NULL;     /* just the last part */
 

diff --git a/src/store.cc b/src/store.cc
index 2dddb780e2e22d55fafe152310c1c6cd5d0a1c2c..465c3a175fa9c941b2379ca4ac7810a48ad08472 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
-/* $Id: store.cc,v 1.54 1996/04/16 05:05:32 wessels Exp $ */
-#ident "$Id: store.cc,v 1.54 1996/04/16 05:05:32 wessels Exp $"
+/* $Id: store.cc,v 1.55 1996/04/16 20:53:33 wessels Exp $ */
+#ident "$Id: store.cc,v 1.55 1996/04/16 20:53:33 wessels Exp $"
 
 /*
  * DEBUG: Section 20          store
@@ -38,9 +38,6 @@
 #define SWAP_BUF               DISK_PAGE_SIZE
 #define FATAL_BUF_SIZE         1024
 #define SWAP_DIRECTORIES       100
-#ifndef DEFAULT_SWAP_DIR
-#define DEFAULT_SWAP_DIR       "/tmp/cache"
-#endif
 
 #define WITH_MEMOBJ    1
 #define WITHOUT_MEMOBJ 0
@@ -2504,7 +2501,7 @@ void storeSanityCheck()
     int i;
 
     if (ncache_dirs < 1)
-       storeAddSwapDisk(DEFAULT_SWAP_DIR);
+       storeAddSwapDisk(DefaultSwapDir);
 
     for (i = 0; i < SWAP_DIRECTORIES; i++) {
        sprintf(name, "%s/%02d", swappath(i), i);