Removed /squid/ from $(datadir) uses to be consistent with the

other paths.

diff --git a/errors/Makefile.am b/errors/Makefile.am
index 1b4b6dec2a48b34021b71e5a033156aa7478a133..a22a7d69a9468250b4ec154cef9b3d805a4417d8 100644 (file)
--- a/errors/Makefile.am
+++ b/errors/Makefile.am
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.in
 #
-# $Id: Makefile.am,v 1.4 2001/11/30 14:52:12 hno Exp $
+# $Id: Makefile.am,v 1.5 2001/11/30 15:27:13 hno Exp $
 #
 
-errordir = $(datadir)/squid/errors
+errordir = $(datadir)/errors
 
 
 ##dist-hook eveything

diff --git a/icons/Makefile.am b/icons/Makefile.am
index 5bd62650f5abe07d7f66fad1a26cbfe0f9c08d0b..aef29f92785c82cc77924a802cf60b743549e38b 100644 (file)
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.4 2001/11/30 14:52:12 hno Exp $
+# $Id: Makefile.am,v 1.5 2001/11/30 15:27:13 hno Exp $
 #
 
 ICON1  =       anthony-binhex.gif
@@ -29,7 +29,7 @@ ICON2         =       anthony-bomb.gif \
                anthony-xbm.gif \
                anthony-xpm.gif
 
-icondir = $(datadir)/squid/icons
+icondir = $(datadir)/icons
 icon_DATA = $(ICON1) $(ICON2)
 EXTRA_DIST = $(ICON1) $(ICON2) icons.shar
 DISTCLEANFILES = $(ICON1) $(ICON2)

diff --git a/src/Makefile.am b/src/Makefile.am
index 31f0ba58e440f6ef91774c8b2b9f8aa02e687b6f..7de4aad405fcf856e56bb786a5a682f8328494c1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.13 2001/11/30 14:52:12 hno Exp $
+#  $Id: Makefile.am,v 1.14 2001/11/30 15:27:13 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -271,8 +271,8 @@ DEFAULT_SWAP_DIR        = $(localstatedir)/cache
 DEFAULT_PINGER         = $(libexecdir)/@OPT_PINGER_EXE@
 DEFAULT_UNLINKD                = $(libexecdir)/$(UNLINKD_EXE)
 DEFAULT_DISKD          = $(libexecdir)/@OPT_DISKD_EXE@
-DEFAULT_ICON_DIR       = $(datadir)/squid/icons
-DEFAULT_ERROR_DIR      = $(datadir)/squid/errors/@ERR_DEFAULT_LANGUAGE@
+DEFAULT_ICON_DIR       = $(datadir)/icons
+DEFAULT_ERROR_DIR      = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
 DEFAULT_MIB_PATH       = $(sysconfdir)/mib.txt
 
 DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"