-diff -urN squid-2.7.STABLE4.orig/src/Makefile.am squid-2.7.STABLE4/src/Makefile.am
---- squid-2.7.STABLE4.orig/src/Makefile.am 2008-01-02 16:50:39.000000000 +0100
-+++ squid-2.7.STABLE4/src/Makefile.am 2008-09-18 12:38:18.280169505 +0200
-@@ -340,13 +340,13 @@
- DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
- DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
- DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
--DEFAULT_LOG_PREFIX = $(localstatedir)/logs
-+DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid
- DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
+diff -ur squid-3.1.14-orig/src/Makefile.am squid-3.1.14/src/Makefile.am
+--- squid-3.1.14-orig/src/Makefile.am 2011-07-04 06:38:34.000000000 +0200
++++ squid-3.1.14/src/Makefile.am 2011-07-12 13:15:33.936929633 +0200
+@@ -728,8 +728,8 @@
DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
--DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
+ DEFAULT_PID_FILE = $(DEFAULT_PIDFILE)
-DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state
-DEFAULT_SWAP_DIR = $(localstatedir)/cache
-+DEFAULT_PID_FILE = /var/run/squid.pid
-+DEFAULT_NETDB_FILE = $(DEFAULT_SWAP_DIR)/netdb.state
+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid
++DEFAULT_NETDB_FILE = $(DEFAULT_SWAP_DIR)/netdb.state
+ DEFAULT_SSL_DB_DIR = $(localstatedir)/lib/ssl_db
DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_DISKD = $(libexecdir)/`echo diskd-daemon | sed '$(transform);s/$$/$(EXEEXT)/'`