Re-fix icons/ FHS compliance

It seems I was working out of an outdated copy of the FHS.
Current standards describe /var/www as deprecated.

Reverting the icons location back to where it started.

diff --git a/icons/Makefile.am b/icons/Makefile.am
index 375f812152604581a12521a14d771b59bff675e9..89138a4d66ad782b0265b859bff65c3c4de92672 100644 (file)
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,12 +1,12 @@
 include $(top_srcdir)/icons/list
 
-icondir = $(localstatedir)/www/squid/icons/silk
+icondir = $(datadir)/icons/silk
 icon_DATA = $(ICONS)
 EXTRA_DIST = $(ICONS) list SN.png
 DISTCLEANFILES = 
 
 install-data-local: SN.png install-iconDATA
-       $(INSTALL_DATA) $(srcdir)/SN.png "$(DESTDIR)$(localstatedir)/www/squid/icons/"
+       $(INSTALL_DATA) $(srcdir)/SN.png "$(DESTDIR)$(datadir)/icons/"
 
 uninstall-local:
-       $(RM) $(DESTDIR)$(localstatedir)/www/squid/icons/SN.png
+       $(RM) $(DESTDIR)$(datadir)/icons/SN.png

diff --git a/src/Makefile.am b/src/Makefile.am
index c95b39ca49e2bbb4297fffbfae6c6a1595e41ebf..27d715dfeece67eb51d4570f6ab4f3374320edce 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -820,7 +820,7 @@ DEFAULT_PINGER              = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/
 DEFAULT_UNLINKD                = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_LOGFILED       = $(libexecdir)/`echo log_file_daemon | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_DISKD          = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
-DEFAULT_ICON_DIR       = $(localstatedir)/www/squid/icons
+DEFAULT_ICON_DIR       = $(datadir)/icons
 DEFAULT_ERROR_DIR      = $(datadir)/errors
 
 # Make location configure settings available to the code
@@ -913,19 +913,7 @@ man_MANS = squid.8
 EXTRA_DIST += squid.8.in
 CLEANFILES += squid.8
 
-## check for existing Squid icons (used to be $datadir/icons).
-## move them into the new icons location so we dont break anyones existing mime.conf
-mimeconf-Upgrade-Shuffle:
-       @if test -d $(DESTDIR)$(datadir)/icons; then \
-         mv $(DESTDIR)$(datadir)/icons/* $(DESTDIR)$(DEFAULT_ICON_DIR)/; \
-         $(RM) -r $(DESTDIR)$(datadir)/icons; \
-         echo "NOTICE: "; \
-         echo "NOTICE: The Squid icons have been upgraded. Please update your $(DESTDIR)$(DEFAULT_MIME_TABLE)." ; \
-         echo "NOTICE: $(DESTDIR)$(DEFAULT_MIME_TABLE).default contains the new icon configuration." ; \
-         echo "NOTICE: "; \
-       fi
-
-install-data-local: install-sysconfDATA install-dataDATA mimeconf-Upgrade-Shuffle
+install-data-local: install-sysconfDATA install-dataDATA
        @if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \
          echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \
        else \