rpms/squid/devel squid-3.1.0.13-build.patch,1.2,1.3
Henrik Nordström
hno at fedoraproject.org
Fri Sep 4 02:22:04 UTC 2009
Author: hno
Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3284
Modified Files:
squid-3.1.0.13-build.patch
Log Message:
One more needed pkgdatadir change found by Jiri Skala
squid-3.1.0.13-build.patch:
errors/Makefile.am | 2 -
errors/Makefile.in | 2 -
icons/Makefile.am | 2 -
icons/Makefile.in | 2 -
src/Makefile.am | 16 +++++++-----
src/Makefile.in | 67 +++++++++++++++++++++++++++--------------------------
6 files changed, 48 insertions(+), 43 deletions(-)
Index: squid-3.1.0.13-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid-3.1.0.13-build.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- squid-3.1.0.13-build.patch 31 Aug 2009 23:57:30 -0000 1.2
+++ squid-3.1.0.13-build.patch 4 Sep 2009 02:22:04 -0000 1.3
@@ -1,6 +1,6 @@
diff -up squid-3.1.0.13/errors/Makefile.am.build squid-3.1.0.13/errors/Makefile.am
--- squid-3.1.0.13/errors/Makefile.am.build 2009-08-04 15:32:08.000000000 +0200
-+++ squid-3.1.0.13/errors/Makefile.am 2009-09-01 01:55:37.000000000 +0200
++++ squid-3.1.0.13/errors/Makefile.am 2009-09-04 04:11:29.000000000 +0200
@@ -3,7 +3,7 @@
# $Id$
#
@@ -12,7 +12,7 @@ diff -up squid-3.1.0.13/errors/Makefile.
diff -up squid-3.1.0.13/errors/Makefile.in.build squid-3.1.0.13/errors/Makefile.in
--- squid-3.1.0.13/errors/Makefile.in.build 2009-08-04 15:32:30.000000000 +0200
-+++ squid-3.1.0.13/errors/Makefile.in 2009-09-01 01:56:14.000000000 +0200
++++ squid-3.1.0.13/errors/Makefile.in 2009-09-04 04:19:05.000000000 +0200
@@ -221,7 +221,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
@@ -24,7 +24,7 @@ diff -up squid-3.1.0.13/errors/Makefile.
TRANSLATIONPO = `ls -1 $(top_srcdir)/errors/*.po | grep -o -E "[a-z\-]+\.po" | sed s/.po//`
diff -up squid-3.1.0.13/icons/Makefile.am.build squid-3.1.0.13/icons/Makefile.am
--- squid-3.1.0.13/icons/Makefile.am.build 2009-08-04 15:32:10.000000000 +0200
-+++ squid-3.1.0.13/icons/Makefile.am 2009-09-01 01:55:37.000000000 +0200
++++ squid-3.1.0.13/icons/Makefile.am 2009-09-04 04:11:29.000000000 +0200
@@ -29,7 +29,7 @@ ICONS = anthony-binhex.gif \
anthony-xbm.gif \
anthony-xpm.gif
@@ -36,7 +36,7 @@ diff -up squid-3.1.0.13/icons/Makefile.a
DISTCLEANFILES =
diff -up squid-3.1.0.13/icons/Makefile.in.build squid-3.1.0.13/icons/Makefile.in
--- squid-3.1.0.13/icons/Makefile.in.build 2009-08-04 15:32:35.000000000 +0200
-+++ squid-3.1.0.13/icons/Makefile.in 2009-09-01 01:56:19.000000000 +0200
++++ squid-3.1.0.13/icons/Makefile.in 2009-09-04 04:19:10.000000000 +0200
@@ -258,7 +258,7 @@ ICONS = anthony-binhex.gif \
anthony-xbm.gif \
anthony-xpm.gif
@@ -48,7 +48,7 @@ diff -up squid-3.1.0.13/icons/Makefile.i
DISTCLEANFILES =
diff -up squid-3.1.0.13/src/Makefile.am.build squid-3.1.0.13/src/Makefile.am
--- squid-3.1.0.13/src/Makefile.am.build 2009-08-04 15:32:13.000000000 +0200
-+++ squid-3.1.0.13/src/Makefile.am 2009-09-01 01:55:37.000000000 +0200
++++ squid-3.1.0.13/src/Makefile.am 2009-09-04 04:18:01.000000000 +0200
@@ -639,7 +639,9 @@ sysconf_DATA = \
squid.conf.documented \
mime.conf.default
@@ -60,7 +60,7 @@ diff -up squid-3.1.0.13/src/Makefile.am.
mib.txt
LDADD = $(COMMON_LIBS) -L../lib -lmiscutil @XTRA_LIBS@ @EPOLL_LIBS@ @MINGW_LIBS@
-@@ -712,13 +714,13 @@ DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_
+@@ -712,17 +714,17 @@ DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_
DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
DEFAULT_PID_FILE = @DEFAULT_PIDFILE@
DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state
@@ -78,6 +78,11 @@ diff -up squid-3.1.0.13/src/Makefile.am.
DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
# Make location configure settings available to the code
+-DEFS += -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" -DDEFAULT_SQUID_DATA_DIR=\"$(datadir)\" -DDEFAULT_SQUID_CONFIG_DIR=\"$(sysconfdir)\"
++DEFS += -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" -DDEFAULT_SQUID_DATA_DIR=\"$(pkgdatadir)\" -DDEFAULT_SQUID_CONFIG_DIR=\"$(sysconfdir)\"
+
+ snmp_core.o snmp_agent.o: ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h
+
@@ -785,7 +787,7 @@ cf.data: cf.data.pre Makefile
repl_modules.cc: repl_modules.sh Makefile
$(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.cc
@@ -89,7 +94,7 @@ diff -up squid-3.1.0.13/src/Makefile.am.
else \
diff -up squid-3.1.0.13/src/Makefile.in.build squid-3.1.0.13/src/Makefile.in
--- squid-3.1.0.13/src/Makefile.in.build 2009-08-04 15:32:36.000000000 +0200
-+++ squid-3.1.0.13/src/Makefile.in 2009-09-01 01:56:20.000000000 +0200
++++ squid-3.1.0.13/src/Makefile.in 2009-09-04 04:19:11.000000000 +0200
@@ -130,7 +130,7 @@ am_libsquid_la_OBJECTS = comm.lo CommCal
SquidConfig.lo TextException.lo
libsquid_la_OBJECTS = $(am_libsquid_la_OBJECTS)
@@ -111,6 +116,15 @@ diff -up squid-3.1.0.13/src/Makefile.in.
HEADERS = $(noinst_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
+@@ -1361,7 +1361,7 @@ DEFAULT_PIDFILE = @DEFAULT_PIDFILE@
+
+ # Make location configure settings available to the code
+ DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" \
+- -DDEFAULT_SQUID_DATA_DIR=\"$(datadir)\" \
++ -DDEFAULT_SQUID_DATA_DIR=\"$(pkgdatadir)\" \
+ -DDEFAULT_SQUID_CONFIG_DIR=\"$(sysconfdir)\"
+ DEPDIR = @DEPDIR@
+ DIGEST_AUTH_HELPERS = @DIGEST_AUTH_HELPERS@
@@ -1850,7 +1850,10 @@ sysconf_DATA = \
squid.conf.documented \
mime.conf.default
More information about the fedora-extras-commits
mailing list