summaryrefslogtreecommitdiffstats
path: root/apr-util-1.2.7-pkgconf.patch
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2010-10-02 10:01:36 +0200
committerRemi Collet <fedora@famillecollet.com>2010-10-02 10:01:36 +0200
commita6739f19903a45ec8e0fbf91bd7476fede28c929 (patch)
tree467d11385dcec6acd6b81c614e9bd11b62c71113 /apr-util-1.2.7-pkgconf.patch
work on httpd 2.3.8HEADmaster
Diffstat (limited to 'apr-util-1.2.7-pkgconf.patch')
-rw-r--r--apr-util-1.2.7-pkgconf.patch25
1 files changed, 25 insertions, 0 deletions
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@"