squid-fhs.patch

   1 diff -urN squid-2.4.STABLE1.orig/src/Makefile.in squid-2.4.STABLE1/src/Makefile.in
   2 --- squid-2.4.STABLE1.orig/src/Makefile.in      Sat Feb 10 15:41:26 2001
   3 +++ squid-2.4.STABLE1/src/Makefile.in   Thu Mar 22 16:07:21 2001
   4 @@ -16,6 +16,7 @@
   5  sysconfdir     = @sysconfdir@
   6  localstatedir   = @localstatedir@
   7  srcdir         = @srcdir@
   8 +datadir                = @prefix@/share
   9  VPATH          = @srcdir@
  10
  11  SUBDIRS                = fs repl
  12 @@ -36,17 +37,17 @@
  13  DEFAULT_PREFIX         = $(prefix)
  14  DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
  15  DEFAULT_MIME_TABLE     = $(sysconfdir)/mime.conf
  16 -DEFAULT_DNSSERVER       = $(libexecdir)/$(DNSSERVER_EXE)
  17 -DEFAULT_CACHE_LOG       = $(localstatedir)/logs/cache.log
  18 -DEFAULT_ACCESS_LOG      = $(localstatedir)/logs/access.log
  19 -DEFAULT_STORE_LOG       = $(localstatedir)/logs/store.log
  20 -DEFAULT_PID_FILE        = $(localstatedir)/logs/squid.pid
  21 -DEFAULT_SWAP_DIR        = $(localstatedir)/cache
  22 -DEFAULT_PINGER         = $(libexecdir)/$(PINGER_EXE)
  23 -DEFAULT_UNLINKD                = $(libexecdir)/$(UNLINKD_EXE)
  24 -DEFAULT_DISKD          = $(libexecdir)/$(DISKD_EXE)
  25 -DEFAULT_ICON_DIR       = $(sysconfdir)/icons
  26 -DEFAULT_ERROR_DIR      = $(sysconfdir)/errors
  27 -DEFAULT_MIB_PATH       = $(sysconfdir)/mib.txt
  28 +DEFAULT_DNSSERVER       = $(bindir)/$(DNSSERVER_EXE)
  29 +DEFAULT_CACHE_LOG       = $(localstatedir)/log/squid/cache.log
  30 +DEFAULT_ACCESS_LOG      = $(localstatedir)/log/squid/access.log
  31 +DEFAULT_STORE_LOG       = $(localstatedir)/log/squid/store.log
  32 +DEFAULT_PID_FILE        = $(localstatedir)/run/squid.pid
  33 +DEFAULT_SWAP_DIR        = $(localstatedir)/cache/squid
  34 +DEFAULT_PINGER         = $(bindir)/$(PINGER_EXE)
  35 +DEFAULT_UNLINKD                = $(bindir)/$(UNLINKD_EXE)
  36 +DEFAULT_DISKD           = $(bindir)/$(DISKD_EXE)
  37 +DEFAULT_ICON_DIR       = $(datadir)/squid/icons
  38 +DEFAULT_ERROR_DIR      = $(datadir)/squid/errors
  39 +DEFAULT_MIB_PATH       = $(datadir)/squid/mib.txt
  40
  41  CC             = @CC@
  42  MAKEDEPEND     = @MAKEDEPEND@