108 lines
4.4 KiB
Plaintext
108 lines
4.4 KiB
Plaintext
$OpenBSD: patch-src_Makefile_in,v 1.5 2002/08/23 14:10:20 brad Exp $
|
|
--- src/Makefile.in.orig Fri Jul 12 11:10:04 2002
|
|
+++ src/Makefile.in Fri Aug 23 09:32:02 2002
|
|
@@ -33,7 +33,7 @@ bindir = @bindir@
|
|
sbindir = @sbindir@
|
|
libexecdir = @libexecdir@
|
|
datadir = @datadir@
|
|
-sysconfdir = @sysconfdir@
|
|
+sysconfdir = @sysconfdir@/squid
|
|
sharedstatedir = @sharedstatedir@
|
|
localstatedir = @localstatedir@
|
|
libdir = @libdir@
|
|
@@ -373,8 +373,8 @@ EXTRA_DIST = \
|
|
|
|
|
|
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)/@OPT_DNSSERVER_EXE@
|
|
DEFAULT_LOG_PREFIX = $(localstatedir)/logs
|
|
DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
|
|
@@ -389,7 +389,7 @@ DEFAULT_ICON_DIR = $(datadir)/icons
|
|
DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
|
|
DEFAULT_MIB_PATH = $(datadir)/mib.txt
|
|
|
|
-DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
|
|
+DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(sysconfdir)/squid.conf\"
|
|
|
|
DISTCLEANFILES = cf_gen_defines.h cf.data cf_parser.h squid.conf.default \
|
|
globals.c string_arrays.c repl_modules.c auth_modules.c store_modules.c
|
|
@@ -424,7 +424,7 @@ am_cachemgr__CGIEXT__OBJECTS = cachemgr.
|
|
cachemgr__CGIEXT__OBJECTS = $(am_cachemgr__CGIEXT__OBJECTS)
|
|
cachemgr__CGIEXT__LDADD = $(LDADD)
|
|
cachemgr__CGIEXT__DEPENDENCIES =
|
|
-cachemgr__CGIEXT__LDFLAGS =
|
|
+cachemgr__CGIEXT__LDFLAGS = -static
|
|
am_cf_gen_OBJECTS = cf_gen.$(OBJEXT)
|
|
cf_gen_OBJECTS = $(am_cf_gen_OBJECTS)
|
|
cf_gen_LDADD = $(LDADD)
|
|
@@ -819,37 +819,37 @@ CCDEPMODE = @CCDEPMODE@
|
|
uninstall-info-am:
|
|
install-dataDATA: $(data_DATA)
|
|
@$(NORMAL_INSTALL)
|
|
- $(mkinstalldirs) $(DESTDIR)$(datadir)
|
|
+ $(mkinstalldirs) $(DESTDIR)$(prefix)/share/examples/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)$(prefix)/share/examples/squid/$$f"; \
|
|
+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(prefix)/share/examples/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)$(prefix)/share/examples/squid/$$f"; \
|
|
+ rm -f $(DESTDIR)$(prefix)/share/examples/squid/$$f; \
|
|
done
|
|
install-sysconfDATA: $(sysconf_DATA)
|
|
@$(NORMAL_INSTALL)
|
|
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
|
|
+ $(mkinstalldirs) $(DESTDIR)$(prefix)/share/examples/squid
|
|
@list='$(sysconf_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)$(sysconfdir)/$$f"; \
|
|
- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \
|
|
+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(prefix)/share/examples/squid/$$f"; \
|
|
+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(prefix)/share/examples/squid/$$f; \
|
|
done
|
|
|
|
uninstall-sysconfDATA:
|
|
@$(NORMAL_UNINSTALL)
|
|
@list='$(sysconf_DATA)'; for p in $$list; do \
|
|
f="`echo $$p | sed -e 's|^.*/||'`"; \
|
|
- 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
|
|
@@ -983,7 +983,7 @@ check: check-recursive
|
|
all-am: Makefile $(PROGRAMS) $(DATA)
|
|
installdirs: installdirs-recursive
|
|
installdirs-am:
|
|
- $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(libexecdir) $(DESTDIR)$(sbindir) $(DESTDIR)$(datadir) $(DESTDIR)$(sysconfdir)
|
|
+ $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(libexecdir) $(DESTDIR)$(sbindir) $(DESTDIR)$(prefix)/share/examples/squid
|
|
|
|
install: install-recursive
|
|
install-exec: install-exec-recursive
|
|
@@ -1107,7 +1107,7 @@ cf_gen_defines.h: $(srcdir)/cf_gen_defin
|
|
|
|
cf.data: cf.data.pre Makefile
|
|
sed "\
|
|
- 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;\
|