Attachment 308572 Details for Bug 450352 – patch autotools source files to achieve same results as squid-3.0.STABLE1-build.patch

[patch] patch autotools source files to achieve same results as squid-3.0.STABLE1-build.patch

squid-3.0.STABLE2-fedora_build-fix.patch (text/plain), 4.52 KB, created by Elmar Hoffmann on 2008-06-06 21:34:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elmar Hoffmann

Created: 2008-06-06 21:34:11 UTC

Size: 4.52 KB

patch

obsolete

>diff -rNu squid-3.0.STABLE2.filter+fedora/errors/Makefile.am squid-3.0.STABLE2/errors/Makefile.am
>--- squid-3.0.STABLE2.filter+fedora/errors/Makefile.am	2008-02-27 11:55:13.000000000 +0100
>+++ squid-3.0.STABLE2/errors/Makefile.am	2008-06-06 22:51:10.000000000 +0200
>@@ -3,12 +3,12 @@
> # $Id: Makefile.am,v 1.14.2.1 2008/02/27 10:55:13 amosjeffries Exp $
> #
> 
>-errordir = $(datadir)/errors
>+errordir = $(pkgdatadir)/errors
> 
> 
> ##dist-hook eveything
> 
>-DEFAULT_ERROR_DIR	= $(errordir)
>+DEFAULT_ERROR_DIR	= $(sysconfdir)/errors
> 
> INSTALL_LANGUAGES	= @ERR_LANGUAGES@
> LANGUAGES	= \
>@@ -49,17 +49,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
> 
>@@ -72,13 +72,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 -rNu squid-3.0.STABLE2.filter+fedora/icons/Makefile.am squid-3.0.STABLE2/icons/Makefile.am
>--- squid-3.0.STABLE2.filter+fedora/icons/Makefile.am	2003-05-21 10:24:26.000000000 +0200
>+++ squid-3.0.STABLE2/icons/Makefile.am	2008-06-06 22:51:10.000000000 +0200
>@@ -29,7 +29,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 -rNu squid-3.0.STABLE2.filter+fedora/src/Makefile.am squid-3.0.STABLE2/src/Makefile.am
>--- squid-3.0.STABLE2.filter+fedora/src/Makefile.am	2008-05-29 17:35:35.000000000 +0200
>+++ squid-3.0.STABLE2/src/Makefile.am	2008-06-06 22:51:43.000000000 +0200
>@@ -934,9 +934,7 @@
> 
> sysconf_DATA = \
> 	squid.conf.default \
>-	mime.conf.default
>-
>-data_DATA = \
>+	mime.conf.default \
> 	mib.txt
> 
> LDADD = libsquid.la libauth.la -L../lib -lmiscutil @XTRA_LIBS@ @EPOLL_LIBS@ @MINGW_LIBS@
>@@ -997,18 +995,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	= $(sysconfdir)/mib.txt
> DEFAULT_HOSTS		= @OPT_DEFAULT_HOSTS@
> 
> DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
>@@ -1071,7 +1069,7 @@
> repl_modules.cc: repl_modules.sh Makefile
> 	$(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.cc
> 
>-install-data-local: install-sysconfDATA install-dataDATA
>+install-data-local: install-sysconfDATA
> 	@if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \
> 	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \
> 	else \

Actions: View | Diff

Attachments on bug 450352: 308572