From 32f078829be3bea481ff7a831116b05cd292ae3a Mon Sep 17 00:00:00 2001 From: Henrik Nordstrom Date: Fri, 20 Aug 2010 04:06:26 +0200 Subject: [PATCH] Clean up DEFAULT_PID_FILE in similar manner --- configure.in | 6 +++--- src/Makefile.am | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index 4658189370..78e203d9ed 100644 --- a/configure.in +++ b/configure.in @@ -192,7 +192,7 @@ esac ) AC_SUBST(DEFAULT_LOG_DIR) -DEFAULT_PIDFILE="$localstatedir/run/squid.pid" +DEFAULT_PID_FILE="$localstatedir/run/squid.pid" AC_ARG_WITH(pidfile, AS_HELP_STRING([--with-pidfile=PATH], [Default location for squid pid file. Default: PREFIX/var/run/squid.pid]), [ @@ -201,11 +201,11 @@ case $withval in AC_MSG_ERROR( --with-pidfile requires a file PATH. --with-pidfile=PATH ) ;; *) - DEFAULT_PIDFILE="$withval" + DEFAULT_PID_FILE="$withval" ;; esac ]) -AC_SUBST(DEFAULT_PIDFILE) +AC_SUBST(DEFAULT_PID_FILE) if test "x$GCC" = "xyes"; then GCCVER=`$CC -v 2>&1 | awk '$2 == "version" {print $3}'` diff --git a/src/Makefile.am b/src/Makefile.am index e34b441d3c..1e6b57e126 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -737,7 +737,6 @@ DEFAULT_LOG_PREFIX = $(DEFAULT_LOG_DIR) DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log -DEFAULT_PID_FILE = $(DEFAULT_PIDFILE) DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state DEFAULT_SWAP_DIR = $(localstatedir)/cache DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` -- 2.47.2