1 diff -urN squid-2.5.STABLE1.org/src/Makefile.am squid-2.5.STABLE1/src/Makefile.am
2 --- squid-2.5.STABLE1.org/src/Makefile.am Fri Jan 3 13:50:17 2003
3 +++ squid-2.5.STABLE1/src/Makefile.am Fri Jan 3 14:04:06 2003
6 DEFAULT_PREFIX = $(prefix)
7 DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
8 -DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
9 -DEFAULT_DNSSERVER = $(libexecdir)/@OPT_DNSSERVER_EXE@
10 -DEFAULT_LOG_PREFIX = $(localstatedir)/logs
11 +DEFAULT_MIME_TABLE = $(sysconfdir)/../mime.conf
12 +DEFAULT_DNSSERVER = $(bindir)/@OPT_DNSSERVER_EXE@
13 +DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid
14 DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
15 DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
16 DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
17 -DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
18 -DEFAULT_SWAP_DIR = $(localstatedir)/cache
19 -DEFAULT_PINGER = $(libexecdir)/@OPT_PINGER_EXE@
20 -DEFAULT_UNLINKD = $(libexecdir)/$(UNLINKD_EXE)
21 -DEFAULT_DISKD = $(libexecdir)/@OPT_DISKD_EXE@
22 -DEFAULT_ICON_DIR = $(datadir)/icons
23 -DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
24 -DEFAULT_MIB_PATH = $(datadir)/mib.txt
25 +DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid
26 +DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid
27 +DEFAULT_PINGER = $(bindir)/@OPT_PINGER_EXE@
28 +DEFAULT_UNLINKD = $(bindir)/$(UNLINKD_EXE)
29 +DEFAULT_DISKD = $(bindir)/@OPT_DISKD_EXE@
30 +DEFAULT_ICON_DIR = $(datadir)/squid/icons
31 +DEFAULT_ERROR_DIR = $(datadir)/squid/errors/@ERR_DEFAULT_LANGUAGE@
32 +DEFAULT_MIB_PATH = $(datadir)/squid/mib.txt
34 DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"