[packages/squid.git] / squid-fhs.patch

diff -ur squid-2.5.STABLE7.orig/src/Makefile.am squid-2.5.STABLE7/src/Makefile.am
--- squid-2.5.STABLE7.orig/src/Makefile.am	2004-09-25 23:37:35.000000000 +0200
+++ squid-2.5.STABLE7/src/Makefile.am	2004-10-12 11:34:16.900258376 +0200
@@ -719,8 +719,8 @@
 DEFAULT_ACCESS_LOG      = $(DEFAULT_LOG_PREFIX)/access.log
 DEFAULT_STORE_LOG       = $(DEFAULT_LOG_PREFIX)/store.log
 DEFAULT_PID_FILE        = $(DEFAULT_PIDFILE)
-DEFAULT_NETDB_FILE      = $(DEFAULT_LOG_PREFIX)/netdb.state
-DEFAULT_SWAP_DIR        = $(localstatedir)/cache
+DEFAULT_SWAP_DIR        = $(localstatedir)/cache/squid
+DEFAULT_NETDB_FILE      = $(DEFAULT_SWAP_DIR)/netdb.state
 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)/'`
Commit	Line	Data
	1	diff -ur squid-2.5.STABLE7.orig/src/Makefile.am squid-2.5.STABLE7/src/Makefile.am
	2	--- squid-2.5.STABLE7.orig/src/Makefile.am 2004-09-25 23:37:35.000000000 +0200
	3	+++ squid-2.5.STABLE7/src/Makefile.am 2004-10-12 11:34:16.900258376 +0200
	4	@@ -719,8 +719,8 @@
	5	DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
	6	DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
	7	DEFAULT_PID_FILE = $(DEFAULT_PIDFILE)
	8	-DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state
	9	-DEFAULT_SWAP_DIR = $(localstatedir)/cache
	10	+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid
	11	+DEFAULT_NETDB_FILE = $(DEFAULT_SWAP_DIR)/netdb.state
	12	DEFAULT_PINGER = $(libexecdir)/`echo pinger \| sed '$(transform);s/$$/$(EXEEXT)/'`
	13	DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd \| sed '$(transform);s/$$/$(EXEEXT)/'`
	14	DEFAULT_DISKD = $(libexecdir)/`echo diskd \| sed '$(transform);s/$$/$(EXEEXT)/'`