|
 |
9ca10df |
--- squid-2.6.STABLE2/errors/Makefile.in.build 2006-06-12 08:09:43.000000000 +0200
|
|
|
9ca10df |
+++ squid-2.6.STABLE2/errors/Makefile.in 2006-07-31 09:38:42.000000000 +0200
|
|
|
9ca10df |
@@ -221,8 +221,8 @@
|
|
|
9ca10df |
sharedstatedir = @sharedstatedir@
|
|
|
9ca10df |
sysconfdir = @sysconfdir@
|
|
|
9ca10df |
target_alias = @target_alias@
|
|
|
9ca10df |
-errordir = $(datadir)/errors
|
|
|
9ca10df |
-DEFAULT_ERROR_DIR = $(errordir)
|
|
|
9ca10df |
+errordir = $(pkgdatadir)/errors
|
|
|
9ca10df |
+DEFAULT_ERROR_DIR = $(sysconfdir)/errors
|
|
|
9ca10df |
INSTALL_LANGUAGES = @ERR_LANGUAGES@
|
|
|
9ca10df |
LANGUAGES = \
|
|
|
9ca10df |
Azerbaijani \
|
|
|
9ca10df |
@@ -413,17 +413,17 @@
|
|
|
9ca10df |
|
|
|
9ca10df |
install-data-local:
|
|
|
9ca10df |
@for l in $(INSTALL_LANGUAGES); do \
|
|
|
9ca10df |
- $(mkinstalldirs) $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l && \
|
|
|
9ca10df |
+ $(mkinstalldirs) $(DESTDIR)$(errordir)/$$l && \
|
|
|
9ca10df |
for f in $(srcdir)/$$l/ERR_*; do \
|
|
|
9ca10df |
- echo "$(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l"; \
|
|
|
9ca10df |
- $(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l; \
|
|
|
9ca10df |
+ echo "$(INSTALL_DATA) $$f $(DESTDIR)$(errordir)/$$l"; \
|
|
|
9ca10df |
+ $(INSTALL_DATA) $$f $(DESTDIR)$(errordir)/$$l; \
|
|
|
9ca10df |
done \
|
|
|
9ca10df |
done
|
|
|
9ca10df |
|
|
|
9ca10df |
uninstall-local:
|
|
|
9ca10df |
@for l in $(INSTALL_LANGUAGES); do \
|
|
|
9ca10df |
for f in $(srcdir)/$$l/ERR_*; do \
|
|
|
9ca10df |
- rm -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l/`basename $$f`; \
|
|
|
9ca10df |
+ rm -f $(DESTDIR)$(errordir)/$$l/`basename $$f`; \
|
|
|
9ca10df |
done \
|
|
|
9ca10df |
done
|
|
|
9ca10df |
|
|
|
9ca10df |
@@ -436,13 +436,13 @@
|
|
|
9ca10df |
#
|
|
|
9ca10df |
addlang: all
|
|
|
9ca10df |
-@if test -d $(srcdir)/$(ADDLANG); then \
|
|
|
9ca10df |
- if test -d $(DEFAULT_ERROR_DIR)/$(DESTLANG); then \
|
|
|
9ca10df |
+ if test -d $(errordir)/$(DESTLANG); then \
|
|
|
9ca10df |
cd $(srcdir)/$(ADDLANG)/ ; \
|
|
|
9ca10df |
for f in ERR_*; do \
|
|
|
9ca10df |
- if test -f $(DEFAULT_ERROR_DIR)/$(DESTLANG)/$$f ; then \
|
|
|
9ca10df |
+ if test -f $(errordir)/$(DESTLANG)/$$f ; then \
|
|
|
9ca10df |
echo "appending $(ADDLANG)/$$f"; \
|
|
|
9ca10df |
- echo "
" >> $(DEFAULT_ERROR_DIR)/$(DESTLANG)/$$f ; \
|
|
|
9ca10df |
- cat $$f >> $(DEFAULT_ERROR_DIR)/$(DESTLANG)/$$f; \
|
|
|
9ca10df |
+ echo "
" >> $(errordir)/$(DESTLANG)/$$f ; \
|
|
|
9ca10df |
+ cat $$f >> $(errordir)/$(DESTLANG)/$$f; \
|
|
|
9ca10df |
fi; \
|
|
|
9ca10df |
done; \
|
|
|
9ca10df |
fi \
|
|
|
9ca10df |
--- squid-2.6.STABLE2/icons/Makefile.in.build 2006-06-12 08:10:08.000000000 +0200
|
|
|
9ca10df |
+++ squid-2.6.STABLE2/icons/Makefile.in 2006-07-31 09:38:42.000000000 +0200
|
|
|
9ca10df |
@@ -258,7 +258,7 @@
|
|
|
9ca10df |
anthony-xbm.gif \
|
|
|
9ca10df |
anthony-xpm.gif
|
|
|
9ca10df |
|
|
|
9ca10df |
-icondir = $(datadir)/icons
|
|
|
9ca10df |
+icondir = $(pkgdatadir)/icons
|
|
|
9ca10df |
icon_DATA = $(ICON1) $(ICON2)
|
|
|
9ca10df |
EXTRA_DIST = $(ICON1) $(ICON2) icons.shar
|
|
|
9ca10df |
DISTCLEANFILES =
|
|
|
9ca10df |
--- squid-2.6.STABLE2/src/Makefile.in.build 2006-07-30 10:56:18.000000000 +0200
|
|
|
9ca10df |
+++ squid-2.6.STABLE2/src/Makefile.in 2006-07-31 09:47:33.000000000 +0200
|
|
|
9ca10df |
@@ -586,18 +586,18 @@
|
|
|
9ca10df |
DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
|
|
|
9ca10df |
DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
|
|
|
9ca10df |
DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
|
|
|
9ca10df |
-DEFAULT_LOG_PREFIX = $(localstatedir)/logs
|
|
|
9ca10df |
+DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid
|
|
|
9ca10df |
DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
|
|
|
9ca10df |
DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
|
|
|
9ca10df |
DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
|
|
|
9ca10df |
-DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
|
|
|
9ca10df |
-DEFAULT_SWAP_DIR = $(localstatedir)/cache
|
|
|
9ca10df |
+DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid
|
|
|
9ca10df |
+DEFAULT_SWAP_DIR = $(localstatedir)/spool/squid
|
|
|
9ca10df |
DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
|
|
|
9ca10df |
DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
|
|
|
9ca10df |
DEFAULT_DISKD = $(libexecdir)/`echo diskd-daemon | sed '$(transform);s/$$/$(EXEEXT)/'`
|
|
|
9ca10df |
-DEFAULT_ICON_DIR = $(datadir)/icons
|
|
|
9ca10df |
-DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
|
|
|
9ca10df |
-DEFAULT_MIB_PATH = $(datadir)/mib.txt
|
|
|
9ca10df |
+DEFAULT_ICON_DIR = $(pkgdatadir)/icons
|
|
|
9ca10df |
+DEFAULT_ERROR_DIR = $(pkgdatadir)/errors/@ERR_DEFAULT_LANGUAGE@
|
|
|
9ca10df |
+DEFAULT_MIB_PATH = $(sysconfdir)/mib.txt
|
|
|
9ca10df |
DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
|
|
|
9ca10df |
|
|
|
9ca10df |
# Don't automatically uninstall config files
|
|
|
9ca10df |
@@ -842,20 +842,20 @@
|
|
|
9ca10df |
uninstall-info-am:
|
|
|
9ca10df |
install-dataDATA: $(data_DATA)
|
|
|
9ca10df |
@$(NORMAL_INSTALL)
|
|
|
9ca10df |
- test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
|
|
|
9ca10df |
+ test -z "$(sysconfdir)/squid" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)/squid"
|
|
|
9ca10df |
@list='$(data_DATA)'; for p in $$list; do \
|
|
|
9ca10df |
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
|
9ca10df |
f=$(am__strip_dir) \
|
|
|
9ca10df |
- echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
|
|
|
9ca10df |
- $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
|
|
|
9ca10df |
+ echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
|
|
9ca10df |
+ $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
|
|
|
9ca10df |
done
|
|
|
9ca10df |
|
|
|
9ca10df |
uninstall-dataDATA:
|
|
|
9ca10df |
@$(NORMAL_UNINSTALL)
|
|
|
9ca10df |
@list='$(data_DATA)'; for p in $$list; do \
|
|
|
9ca10df |
f=$(am__strip_dir) \
|
|
|
9ca10df |
- echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
|
|
|
9ca10df |
- rm -f "$(DESTDIR)$(datadir)/$$f"; \
|
|
|
9ca10df |
+ echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
|
|
9ca10df |
+ rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
|
|
|
9ca10df |
done
|
|
|
9ca10df |
install-sysconfDATA: $(sysconf_DATA)
|
|
|
9ca10df |
@$(NORMAL_INSTALL)
|