--- squid-2.5.CVS/icons/Makefile.in.s25	Tue Nov 13 22:58:47 2001
+++ squid-2.5.CVS/icons/Makefile.in	Tue Nov 13 23:00:26 2001
@@ -150,7 +150,7 @@
 		anthony-xpm.gif
 
 
-icondir = $(sysconfdir)/icons
+icondir = $(libexecdir)/icons
 icon_DATA = $(ICON1) $(ICON2)
 EXTRA_DIST = $(ICON1) $(ICON2) icons.shar
 DISTCLEANFILES = $(EXTRA_DIST)
--- squid-2.5.CVS/src/Makefile.in.s25	Tue Nov 13 23:05:20 2001
+++ squid-2.5.CVS/src/Makefile.in	Tue Nov 13 23:06:28 2001
@@ -367,16 +367,16 @@
 DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
 DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
 DEFAULT_DNSSERVER = $(libexecdir)/@OPT_DNSSERVER_EXE@
-DEFAULT_LOG_PREFIX = $(localstatedir)/logs
+DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid
 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_PID_FILE = $(localstatedir)/run/squid.pid
+DEFAULT_SWAP_DIR = $(localstatedir)/spool/squid
 DEFAULT_PINGER = $(libexecdir)/@OPT_PINGER_EXE@
 DEFAULT_UNLINKD = $(libexecdir)/$(UNLINKD_EXE)
 DEFAULT_DISKD = $(libexecdir)/@OPT_DISKD_EXE@
-DEFAULT_ICON_DIR = $(sysconfdir)/icons
+DEFAULT_ICON_DIR = $(libexecdir)/icons
 DEFAULT_ERROR_DIR = $(sysconfdir)/errors
 DEFAULT_MIB_PATH = $(sysconfdir)/mib.txt