26 lines
1.3 KiB
Diff
26 lines
1.3 KiB
Diff
diff -Nru squid-3.0.STABLE9.orig/src/Makefile.in squid-3.0.STABLE9/src/Makefile.in
|
|
--- squid-3.0.STABLE9.orig/src/Makefile.in 2008-10-20 18:11:15.000000000 +0200
|
|
+++ squid-3.0.STABLE9/src/Makefile.in 2008-10-20 18:03:53.000000000 +0200
|
|
@@ -2633,17 +2633,17 @@
|
|
DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
|
|
DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
|
|
DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
|
|
-DEFAULT_LOG_PREFIX = $(localstatedir)/logs
|
|
+DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid
|
|
DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
|
|
DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
|
|
DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
|
|
-DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
|
|
-DEFAULT_SWAP_DIR = $(localstatedir)/cache
|
|
+DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid
|
|
+DEFAULT_SWAP_DIR = $(localstatedir)/squid
|
|
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/@ERR_DEFAULT_LANGUAGE@
|
|
+DEFAULT_ERROR_DIR = $(datadir)/errors
|
|
DEFAULT_MIB_PATH = $(datadir)/mib.txt
|
|
DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
|
|
|