--- squid-2.6.STABLE6/src/Makefile.am~	2007-01-02 13:49:03.000000000 -0200
+++ squid-2.6.STABLE6/src/Makefile.am	2007-01-02 13:54:57.000000000 -0200
@@ -315,16 +315,16 @@
 DEFAULT_MIME_TABLE	= $(sysconfdir)/mime.conf
 DEFAULT_DNSSERVER       = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_LOG_PREFIX	= $(localstatedir)/logs
-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_LOG_PREFIX)/squid.pid
-DEFAULT_SWAP_DIR        = $(localstatedir)/cache
+DEFAULT_CACHE_LOG       = $(localstatedir)/log/squid/cache.log
+DEFAULT_ACCESS_LOG      = $(localstatedir)/log/squid/access.log
+DEFAULT_STORE_LOG       = $(localstatedir)/log/squid/store.log
+DEFAULT_PID_FILE        = $(localstatedir)/run/squid/squid.pid
+DEFAULT_SWAP_DIR        = $(localstatedir)/spool/squid
 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)/'`
-DEFAULT_ICON_DIR	= $(datadir)/icons
-DEFAULT_ERROR_DIR	= $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
+DEFAULT_ICON_DIR	= $(libexecdir)/icons
+DEFAULT_ERROR_DIR	= $(libexecdir)/errors/@ERR_DEFAULT_LANGUAGE@
 DEFAULT_MIB_PATH	= $(datadir)/mib.txt
 DEFAULT_HOSTS		= @OPT_DEFAULT_HOSTS@