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