1 diff -ur squid-2.5.STABLE7.orig/src/Makefile.am squid-2.5.STABLE7/src/Makefile.am
2 --- squid-2.5.STABLE7.orig/src/Makefile.am 2004-09-25 23:37:35.000000000 +0200
3 +++ squid-2.5.STABLE7/src/Makefile.am 2004-10-12 11:34:16.900258376 +0200
5 DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
6 DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
7 DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
8 -DEFAULT_LOG_PREFIX = $(localstatedir)/logs
9 +DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid
10 DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
11 DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
12 DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
13 -DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
14 -DEFAULT_SWAP_DIR = $(localstatedir)/cache
15 +DEFAULT_PID_FILE = /var/run/squid.pid
16 +DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid
17 DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
18 DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
19 DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`