diff --git a/libs/apr/Makefile b/libs/apr/Makefile index f29fe94955..f1db711794 100644 --- a/libs/apr/Makefile +++ b/libs/apr/Makefile @@ -88,7 +88,7 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/share/build-1/* $(1)/usr/share/build-1 $(SED) '/^prefix=\|^exec_prefix=/s|/usr|$(STAGING_DIR)/usr|' \ $(1)/usr/bin/apr-1-config - $(SED) '/^bindir=/s|/usr/bin|$(STAGING_DIR)|' $(1)/usr/bin/apr-1-config + $(SED) '/^bindir=/s|/usr|$$$${prefix}|' $(1)/usr/bin/apr-1-config $(SED) '/^datadir=/s|/usr|$$$${prefix}|' $(1)/usr/bin/apr-1-config $(SED) '/^datarootdir=/s|/usr|$$$${prefix}|' $(1)/usr/bin/apr-1-config $(SED) 's,/usr/share/build-1,$(STAGING_DIR)/usr/share/build-1,g' \ diff --git a/net/subversion/Makefile b/net/subversion/Makefile index 0e733f284a..944a32eba3 100644 --- a/net/subversion/Makefile +++ b/net/subversion/Makefile @@ -80,6 +80,8 @@ define Package/subversion-server/conffiles endef CONFIGURE_ARGS += \ + --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config \ + --with-apr-util=$(STAGING_DIR)/usr/bin/apu-1-config \ --without-swig \ --without-berkeley-db \ --without-apxs \