6a541c
--- apr-util-1.2.7/Makefile.in.pkgconf
6a541c
+++ apr-util-1.2.7/Makefile.in
6a541c
@@ -51,7 +51,7 @@
6a541c
 
6a541c
 # Create apu-config script suitable for the install tree
6a541c
 apu-config.out: $(APU_CONFIG)
6a541c
-	sed 's,^\(location=\).*$$,\1installed,' < $(APU_CONFIG) > $@
6a541c
+	sed 's,^\(location=\).*$$,\1installed,;s,^\(APR_.*_DIR\)=.*,\1="$${libdir}/build",' < $(APU_CONFIG) > $@
6a541c
 
6a541c
 install: $(TARGETS) install-modules
6a541c
 	$(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
6a541c
--- apr-util-1.2.7/apu-config.in.pkgconf
6a541c
+++ apr-util-1.2.7/apu-config.in
6a541c
@@ -24,9 +24,10 @@
6a541c
 prefix="@prefix@"
6a541c
 exec_prefix="@exec_prefix@"
6a541c
 bindir="@bindir@"
6a541c
-libdir="@libdir@"
6a541c
 includedir="@includedir@"
6a541c
 
6a541c
+libdir=`pkg-config --variable=libdir apr-util-@APRUTIL_MAJOR_VERSION@`
6a541c
+
6a541c
 LIBS="@APRUTIL_EXPORT_LIBS@"
6a541c
 INCLUDES="@APRUTIL_INCLUDES@"
6a541c
 LDFLAGS="@APRUTIL_LDFLAGS@"