99 lines
4.3 KiB
Plaintext
99 lines
4.3 KiB
Plaintext
$OpenBSD: patch-src_Makefile_in,v 1.14 2007/09/10 17:49:23 merdely Exp $
|
|
--- src/Makefile.in.orig Wed Sep 5 17:57:25 2007
|
|
+++ src/Makefile.in Wed Sep 5 21:01:07 2007
|
|
@@ -224,7 +224,7 @@ CPP = @CPP@
|
|
CPPFLAGS = @CPPFLAGS@
|
|
CRYPTLIB = @CRYPTLIB@
|
|
CYGPATH_W = @CYGPATH_W@
|
|
-DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
|
|
+DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(sysconfdir)/squid.conf\"
|
|
DEPDIR = @DEPDIR@
|
|
DIGEST_AUTH_HELPERS = @DIGEST_AUTH_HELPERS@
|
|
ECHO_C = @ECHO_C@
|
|
@@ -382,7 +382,7 @@ program_transform_name = @program_transform_name@
|
|
psdir = @psdir@
|
|
sbindir = @sbindir@
|
|
sharedstatedir = @sharedstatedir@
|
|
-sysconfdir = @sysconfdir@
|
|
+sysconfdir = @sysconfdir@/squid
|
|
target_alias = @target_alias@
|
|
@USE_DNSSERVER_FALSE@DNSSOURCE = dns_internal.c
|
|
@USE_DNSSERVER_TRUE@DNSSOURCE = dns.c
|
|
@@ -622,8 +622,8 @@ EXTRA_DIST = \
|
|
DEFAULT_HTTP_PORT = @CACHE_HTTP_PORT@
|
|
DEFAULT_ICP_PORT = @CACHE_ICP_PORT@
|
|
DEFAULT_PREFIX = $(prefix)
|
|
-DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
|
|
-DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
|
|
+DEFAULT_CONFIG_FILE = $(prefix)/share/examples/squid/squid.conf
|
|
+DEFAULT_MIME_TABLE = $(prefix)/share/examples/squid/mime.conf
|
|
DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
|
|
DEFAULT_LOG_PREFIX = $(localstatedir)/logs
|
|
DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
|
|
@@ -884,37 +884,37 @@ distclean-compile:
|
|
uninstall-info-am:
|
|
install-dataDATA: $(data_DATA)
|
|
@$(NORMAL_INSTALL)
|
|
- test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
|
|
+ test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(prefix)/share/examples/squid"
|
|
@list='$(data_DATA)'; for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
f=$(am__strip_dir) \
|
|
- echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
|
|
- $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
|
|
+ echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(prefix)/share/examples/squid/$$f'"; \
|
|
+ $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(prefix)/share/examples/squid/$$f"; \
|
|
done
|
|
|
|
uninstall-dataDATA:
|
|
@$(NORMAL_UNINSTALL)
|
|
@list='$(data_DATA)'; for p in $$list; do \
|
|
f=$(am__strip_dir) \
|
|
- echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
|
|
- rm -f "$(DESTDIR)$(datadir)/$$f"; \
|
|
+ echo " rm -f '$(DESTDIR)$(prefix)/share/examples/squid/$$f'"; \
|
|
+ rm -f "$(DESTDIR)$(prefix)/share/examples/squid/$$f"; \
|
|
done
|
|
install-sysconfDATA: $(sysconf_DATA)
|
|
@$(NORMAL_INSTALL)
|
|
- test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
|
|
+ test -z "$(DESTDIR)$(prefix)/share/examples/squid" || $(mkdir_p) "$(DESTDIR)$(prefix)/share/examples/squid"
|
|
@list='$(sysconf_DATA)'; for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
f=$(am__strip_dir) \
|
|
- echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
|
- $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
|
|
+ echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(prefix)/share/examples/squid/$$f'"; \
|
|
+ $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(prefix)/share/examples/squid/$$f"; \
|
|
done
|
|
|
|
uninstall-sysconfDATA:
|
|
@$(NORMAL_UNINSTALL)
|
|
@list='$(sysconf_DATA)'; for p in $$list; do \
|
|
f=$(am__strip_dir) \
|
|
- echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
|
- rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
|
|
+ echo " rm -f '$(DESTDIR)$(prefix)/share/examples/squid/$$f'"; \
|
|
+ rm -f "$(DESTDIR)$(prefix)/share/examples/squid/$$f"; \
|
|
done
|
|
|
|
# This directory's subdirectories are mostly independent; you can cd
|
|
@@ -1097,7 +1097,7 @@ check: $(BUILT_SOURCES)
|
|
all-am: Makefile $(PROGRAMS) $(DATA)
|
|
installdirs: installdirs-recursive
|
|
installdirs-am:
|
|
- for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(sysconfdir)"; do \
|
|
+ for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(DESTDIR)$(prefix)/share/examples/squid"; do \
|
|
test -z "$$dir" || $(mkdir_p) "$$dir"; \
|
|
done
|
|
install: $(BUILT_SOURCES)
|
|
@@ -1236,7 +1236,7 @@ cf.data: cf.data.pre Makefile
|
|
sed "\
|
|
s%@DEFAULT_HTTP_PORT@%$(DEFAULT_HTTP_PORT)%g;\
|
|
s%@DEFAULT_ICP_PORT@%$(DEFAULT_ICP_PORT)%g;\
|
|
- s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\
|
|
+ s%@DEFAULT_MIME_TABLE@%$(sysconfdir)/mime.conf%g;\
|
|
s%@DEFAULT_DNSSERVER@%$(DEFAULT_DNSSERVER)%g;\
|
|
s%@DEFAULT_UNLINKD@%$(DEFAULT_UNLINKD)%g;\
|
|
s%@DEFAULT_PINGER@%$(DEFAULT_PINGER)%g;\
|