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 17:58:35 2003
3 +++ squid-2.5.STABLE1/src/Makefile.am Fri Jan 3 18:35:12 2003
5 DEFAULT_PREFIX = $(prefix)
6 DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
7 DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
8 -DEFAULT_DNSSERVER = $(libexecdir)/@OPT_DNSSERVER_EXE@
9 -DEFAULT_LOG_PREFIX = $(localstatedir)/logs
10 +DEFAULT_DNSSERVER = $(bindir)/@OPT_DNSSERVER_EXE@
11 +DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid
12 DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
13 DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
14 DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
15 -DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
16 -DEFAULT_SWAP_DIR = $(localstatedir)/cache
17 -DEFAULT_PINGER = $(libexecdir)/@OPT_PINGER_EXE@
18 -DEFAULT_UNLINKD = $(libexecdir)/$(UNLINKD_EXE)
19 -DEFAULT_DISKD = $(libexecdir)/@OPT_DISKD_EXE@
20 +DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid
21 +DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid
22 +DEFAULT_PINGER = $(bindir)/@OPT_PINGER_EXE@
23 +DEFAULT_UNLINKD = $(bindir)/$(UNLINKD_EXE)
24 +DEFAULT_DISKD = $(bindir)/@OPT_DISKD_EXE@
25 DEFAULT_ICON_DIR = $(datadir)/icons
26 DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
27 DEFAULT_MIB_PATH = $(datadir)/mib.txt