Attachment 290772 Details for Bug 427435 – Updated build patch

[patch] Updated build patch

squid-3.0-build.patch (text/plain), 4.85 KB, created by Trever Adams on 2008-01-03 19:58:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Trever Adams

Created: 2008-01-03 19:58:46 UTC

Size: 4.85 KB

patch

obsolete

>diff -ur squid-3.0.PRE6-20070730-orig/errors/Makefile.in squid-3.0.PRE6-20070730/errors/Makefile.in
>--- squid-3.0.PRE6-20070730-orig/errors/Makefile.in	2007-06-10 06:09:00.000000000 -0600
>+++ squid-3.0.PRE6-20070730/errors/Makefile.in	2007-07-30 07:12:24.000000000 -0600
>@@ -266,8 +266,8 @@
> subdirs = @subdirs@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>-errordir = $(datadir)/errors
>-DEFAULT_ERROR_DIR = $(errordir)
>+errordir = $(pkgdatadir)/errors
>+DEFAULT_ERROR_DIR = $(sysconfdir)/errors
> INSTALL_LANGUAGES = @ERR_LANGUAGES@
> LANGUAGES = \
> 		Azerbaijani \
>@@ -468,17 +468,17 @@
> 
> install-data-local: 
> 	@for l in $(INSTALL_LANGUAGES); do \
>-		$(mkinstalldirs) $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l && \
>+		$(mkinstalldirs) $(DESTDIR)$(errordir)/$$l && \
> 		for f in $(srcdir)/$$l/ERR_*; do \
>-			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l"; \
>-			$(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l; \
>+			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(errordir)/$$l"; \
>+			$(INSTALL_DATA) $$f $(DESTDIR)$(errordir)/$$l; \
> 		done \
> 	done
> 
> uninstall-local:
> 	@for l in $(INSTALL_LANGUAGES); do \
> 		for f in $(srcdir)/$$l/ERR_*; do \
>-	        	rm -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l/`basename $$f`; \
>+	        	rm -f $(DESTDIR)$(errordir)/$$l/`basename $$f`; \
> 		done \
> 	done
> 
>@@ -491,13 +491,13 @@
> #
> addlang: all
> 	-@if test -d $(srcdir)/$(ADDLANG); then \
>-	if test -d $(DEFAULT_ERROR_DIR)/$(DESTLANG); then \
>+	if test -d $(errordir)/$(DESTLANG); then \
> 	cd $(srcdir)/$(ADDLANG)/ ; \
> 	for f in ERR_*; do \
>-		if test -f $(DEFAULT_ERROR_DIR)/$(DESTLANG)/$$f ; then \
>+		if test -f $(errordir)/$(DESTLANG)/$$f ; then \
> 			echo "appending $(ADDLANG)/$$f"; \
>-			echo "<HR>" >> $(DEFAULT_ERROR_DIR)/$(DESTLANG)/$$f ; \
>-			cat $$f >> $(DEFAULT_ERROR_DIR)/$(DESTLANG)/$$f; \
>+			echo "<HR>" >> $(errordir)/$(DESTLANG)/$$f ; \
>+			cat $$f >> $(errordir)/$(DESTLANG)/$$f; \
> 		fi; \
> 	done; \
> 	fi \
>diff -ur squid-3.0.PRE6-20070730-orig/icons/Makefile.in squid-3.0.PRE6-20070730/icons/Makefile.in
>--- squid-3.0.PRE6-20070730-orig/icons/Makefile.in	2007-06-10 06:09:17.000000000 -0600
>+++ squid-3.0.PRE6-20070730/icons/Makefile.in	2007-07-30 07:12:24.000000000 -0600
>@@ -303,7 +303,7 @@
> 		anthony-xbm.gif \
> 		anthony-xpm.gif
> 
>-icondir = $(datadir)/icons
>+icondir = $(pkgdatadir)/icons
> icon_DATA = $(ICON1) $(ICON2)
> EXTRA_DIST = $(ICON1) $(ICON2) icons.shar
> DISTCLEANFILES = 
>diff -ur squid-3.0.PRE6-20070730-orig/src/Makefile.in squid-3.0.PRE6-20070730/src/Makefile.in
>--- squid-3.0.PRE6-20070730-orig/src/Makefile.in	2007-06-19 18:10:40.000000000 -0600
>+++ squid-3.0.PRE6-20070730/src/Makefile.in	2007-07-30 07:14:59.000000000 -0600
>@@ -2592,18 +2592,18 @@
> DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
> DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
> DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
>-DEFAULT_LOG_PREFIX = $(localstatedir)/logs
>+DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid
> 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_SWAP_DIR = $(localstatedir)/cache
>+DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid
>+DEFAULT_SWAP_DIR = $(localstatedir)/spool/squid
> 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 = $(pkgdatadir)/icons
>+DEFAULT_ERROR_DIR = $(pkgdatadir)/errors/@ERR_DEFAULT_LANGUAGE@
>+DEFAULT_MIB_PATH = $(sysconfigdir)/mib.txt
> DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
> 
> # Don't automatically uninstall config files
>@@ -4943,20 +4943,20 @@
> uninstall-info-am:
> install-dataDATA: $(data_DATA)
> 	@$(NORMAL_INSTALL)
>-	test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
>+	test -z "$(sysconfdir)/squid" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)/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)$(sysconfdir)/$$f'"; \
>+	  $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$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)$(sysconfdir)/$$f'"; \
>+	  rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
> 	done
> install-sysconfDATA: $(sysconf_DATA)
> 	@$(NORMAL_INSTALL)

Actions: View | Diff

Attachments on bug 427435: 290771 | 290772 | 290773 | 290774 | 290775 | 290776