1 diff -urN squid-2.7.STABLE4.orig/src/Makefile.am squid-2.7.STABLE4/src/Makefile.am
2 --- squid-2.7.STABLE4.orig/src/Makefile.am 2008-01-02 16:50:39.000000000 +0100
3 +++ squid-2.7.STABLE4/src/Makefile.am 2008-09-18 12:38:18.280169505 +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_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state
15 -DEFAULT_SWAP_DIR = $(localstatedir)/cache
16 +DEFAULT_PID_FILE = /var/run/squid.pid
17 +DEFAULT_NETDB_FILE = $(DEFAULT_SWAP_DIR)/netdb.state
18 +DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid
19 DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
20 DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
21 DEFAULT_DISKD = $(libexecdir)/`echo diskd-daemon | sed '$(transform);s/$$/$(EXEEXT)/'`