blob: 49c99f95d057cb4bf5e3b712efbf5441adbab776 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
|
$NetBSD: patch-aa,v 1.18 2006/03/12 12:12:19 taca Exp $
--- src/Makefile.in.orig 2005-09-29 05:57:21.000000000 +0900
+++ src/Makefile.in
@@ -388,14 +388,14 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
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_PID_FILE = $(VARBASE)/run/squid.pid
DEFAULT_SWAP_DIR = $(localstatedir)/cache
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_MIB_PATH = $(datadir)/mib.txt
+DEFAULT_ICON_DIR = $(datadir)/squid/icons
+DEFAULT_ERROR_DIR = $(datadir)/squid/errors/@ERR_DEFAULT_LANGUAGE@
+DEFAULT_MIB_PATH = $(datadir)/squid/mib.txt
DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
@@ -860,20 +860,20 @@ CCDEPMODE = @CCDEPMODE@
uninstall-info-am:
install-dataDATA: $(data_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(datadir)
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/squid
@list='$(data_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f"; \
- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f; \
+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/squid/$$f"; \
+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/squid/$$f; \
done
uninstall-dataDATA:
@$(NORMAL_UNINSTALL)
@list='$(data_DATA)'; for p in $$list; do \
f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(datadir)/$$f"; \
- rm -f $(DESTDIR)$(datadir)/$$f; \
+ echo " rm -f $(DESTDIR)$(datadir)/squid/$$f"; \
+ rm -f $(DESTDIR)$(datadir)/squid/$$f; \
done
install-sysconfDATA: $(sysconf_DATA)
@$(NORMAL_INSTALL)
@@ -1072,7 +1072,7 @@ info-am:
install-data-am: install-data-local install-dataDATA
install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \
- install-sbinPROGRAMS install-sysconfDATA
+ install-sbinPROGRAMS
install-info: install-info-recursive
@@ -1090,7 +1090,7 @@ mostlyclean-am: mostlyclean-compile most
uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA uninstall-info-am \
uninstall-libexecPROGRAMS uninstall-local \
- uninstall-sbinPROGRAMS uninstall-sysconfDATA
+ uninstall-sbinPROGRAMS
uninstall-info: uninstall-info-recursive
@@ -1175,26 +1175,7 @@ repl_modules.c: repl_modules.sh Makefile
auth_modules.c: auth_modules.sh Makefile
@$(SHELL) $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.c
-install-data-local: install-sysconfDATA install-dataDATA
- @if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \
- echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \
- else \
- echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(DEFAULT_MIME_TABLE)" ;\
- $(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(DEFAULT_MIME_TABLE); \
- fi
- @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
- echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
- else \
- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
- fi
- @if test -f $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG) ; then \
- echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)" ; \
- else \
- echo "$(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)"; \
- $(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG); \
- fi
- $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
+install-data-local: install-dataDATA
uninstall-local:
@if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \
|
