--- squid-3.1.0.16-20100224/doc/Makefile.am	2010-02-23 20:39:59.000000000 -0600
+++ squid-3.1.0.16-20100224.dlucio/doc/Makefile.am	2010-02-24 11:58:32.977087959 -0600
@@ -9,7 +9,7 @@
 DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
 DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf
 DEFAULT_MIME_TABLE      = $(sysconfdir)/mime.conf
-DEFAULT_ERROR_DIR       = $(datadir)/errors
+DEFAULT_ERROR_DIR       = $(datadir)/squid/errors/@ERR_DEFAULT_LANGUAGE@
 
 SUBSTITUTE=sed "\
 	s%$(DEFAULT_CONFIG_FILE)%$(DEFAULT_CONFIG_FILE)%g;\
--- squid-3.1.0.16-20100224/errors/Makefile.am	2010-02-23 20:39:59.000000000 -0600
+++ squid-3.1.0.16-20100224.dlucio/errors/Makefile.am	2010-02-24 11:59:01.243082651 -0600
@@ -3,7 +3,7 @@
 # $Id$
 #
 
-errordir = $(datadir)/errors
+errordir = $(datadir)/squid/errors
 
 ##dist-hook eveything
 
--- squid-3.1.0.16-20100224/icons/Makefile.am	2010-02-23 20:39:59.000000000 -0600
+++ squid-3.1.0.16-20100224.dlucio/icons/Makefile.am	2010-02-24 11:59:30.976070847 -0600
@@ -29,7 +29,7 @@
 		anthony-xbm.gif \
 		anthony-xpm.gif
 
-icondir = $(datadir)/icons
+icondir = $(datadir)/squid/icons
 icon_DATA = $(ICONS)
 EXTRA_DIST = $(ICONS)
 DISTCLEANFILES = 
--- squid-3.1.0.16-20100224/src/Makefile.am	2010-02-24 12:04:11.509822139 -0600
+++ squid-3.1.0.16-20100224.dlucio/src/Makefile.am	2010-02-24 12:00:24.064848608 -0600
@@ -723,8 +723,8 @@
 DEFAULT_PINGER		= $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_UNLINKD		= $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_DISKD		= $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
-DEFAULT_ICON_DIR	= $(datadir)/icons
-DEFAULT_ERROR_DIR	= $(datadir)/errors
+DEFAULT_ICON_DIR	= $(datadir)/squid/icons
+DEFAULT_ERROR_DIR	= $(datadir)/squid/errors/@ERR_DEFAULT_LANGUAGE@
 DEFAULT_HOSTS		= $(OPT_DEFAULT_HOSTS)
 
 # Make location configure settings available to the code