From a6739f19903a45ec8e0fbf91bd7476fede28c929 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 2 Oct 2010 10:01:36 +0200 Subject: work on httpd 2.3.8 --- apr-util-1.2.7-pkgconf.patch | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 apr-util-1.2.7-pkgconf.patch (limited to 'apr-util-1.2.7-pkgconf.patch') diff --git a/apr-util-1.2.7-pkgconf.patch b/apr-util-1.2.7-pkgconf.patch new file mode 100644 index 0000000..0e394ec --- /dev/null +++ b/apr-util-1.2.7-pkgconf.patch @@ -0,0 +1,25 @@ +--- apr-util-1.2.7/Makefile.in.pkgconf ++++ apr-util-1.2.7/Makefile.in +@@ -51,7 +51,7 @@ + + # Create apu-config script suitable for the install tree + apu-config.out: $(APU_CONFIG) +- sed 's,^\(location=\).*$$,\1installed,' < $(APU_CONFIG) > $@ ++ sed 's,^\(location=\).*$$,\1installed,;s,^\(APR_.*_DIR\)=.*,\1="$${libdir}/build",' < $(APU_CONFIG) > $@ + + install: $(TARGETS) install-modules + $(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \ +--- apr-util-1.2.7/apu-config.in.pkgconf ++++ apr-util-1.2.7/apu-config.in +@@ -24,9 +24,10 @@ + prefix="@prefix@" + exec_prefix="@exec_prefix@" + bindir="@bindir@" +-libdir="@libdir@" + includedir="@includedir@" + ++libdir=`pkg-config --variable=libdir apr-util-@APRUTIL_MAJOR_VERSION@` ++ + LIBS="@APRUTIL_EXPORT_LIBS@" + INCLUDES="@APRUTIL_INCLUDES@" + LDFLAGS="@APRUTIL_LDFLAGS@" -- cgit