fix apache compile

SVN-Revision: 9877

diff --git a/libs/apr-util/Makefile b/libs/apr-util/Makefile
index f4d281e71dddd61c37af37eeb37a26086f5da3c1..7dbd66cdb4e9ef8b73aa4e0171182207099fa829 100644 (file)
--- a/libs/apr-util/Makefile
+++ b/libs/apr-util/Makefile
@@ -29,7 +29,7 @@ endef
 
 CONFIGURE_ARGS += \
        --with-pgsql=no \
-       --with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
+       --with-apr="$(STAGING_DIR_HOST)/bin/apr-1-config" \
        --with-expat="$(STAGING_DIR)/usr" \
        --without-sqlite2 \
        --with-sqlite3="$(STAGING_DIR)/usr" \
@@ -46,34 +46,35 @@ endef
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) APRUTIL_LIBS="-lsqlite3 -L$(STAGING_DIR)/usr/lib -lexpat -liconv -lapr-1 -luuid -lm -lcrypt" all
-       $(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
        $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+       $(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 endef
 
 define Build/InstallDev
-       mkdir -p $(1)/usr/bin
+       mkdir -p $(2)/bin
        $(CP)   $(PKG_INSTALL_DIR)/usr/bin/apu-1-config \
-               $(1)/usr/bin
+               $(2)/bin
        mkdir -p $(1)/usr/include/apr-1/
        $(CP)   $(PKG_INSTALL_DIR)/usr/include/apr-1/* \
                $(1)/usr/include/apr-1/
        mkdir -p $(1)/usr/lib 
-       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{a,so*} \
+       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{la,a,so*} \
                $(1)/usr/lib/
        mkdir -p $(1)/usr/lib/pkgconfig/
        $(CP)   $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-util-1.pc \
                $(1)/usr/lib/pkgconfig/
-       $(SED) 's, -e \"s -I$$$$prefix/lib  g\",,g' $(1)/usr/bin/apu-1-config
-       $(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(1)/usr/include/,g' $(1)/usr/bin/apu-1-config
-       $(SED) 's,-L$$$$libdir,,g' $(1)/usr/bin/apu-1-config
-       $(SED) 's,-R$$$$libdir,,g' $(1)/usr/bin/apu-1-config
+       $(SED) 's, -e \"s -I$$$$prefix/lib  g\",,g' $(2)/bin/apu-1-config
+       $(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(1)/usr/lib,g' $(2)/bin/apu-1-config
+       $(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(1)/usr/include/,g' $(2)/bin/apu-1-config
+       $(SED) 's,-L$$$$libdir,,g' $(2)/bin/apu-1-config
+       $(SED) 's,-R$$$$libdir,,g' $(2)/bin/apu-1-config
 endef
 
 define Build/UninstallDev
-       rm -rf  $(STAGING_DIR)/usr/bin/apu-1-config \
-               $(STAGING_DIR)/usr/include/apr-1 \
-               $(STAGING_DIR)/usr/lib/libaprutil-1.{a,so*} \
-               $(STAGING_DIR)/usr/lib/pkgconfig/apr-util-1.pc
+       rm -rf  $(2)/bin/apu-1-config \
+               $(1)/usr/include/apr-1 \
+               $(1)/usr/lib/libaprutil-1.{a,so*} \
+               $(1)/usr/lib/pkgconfig/apr-util-1.pc
 endef
 
 define Package/libaprutil/install      

diff --git a/libs/apr/Makefile b/libs/apr/Makefile
index 2b5f3e9dd43dc3aef94fc8ad375f9e493a9c7f2b..98bc0224bfdadc48fe3975e01db26098971a1790 100644 (file)
--- a/libs/apr/Makefile
+++ b/libs/apr/Makefile
@@ -46,19 +46,19 @@ endef
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) all
-       $(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
        $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+       $(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 endef
 
 define Build/InstallDev
-       mkdir -p $(1)/usr/bin
+       mkdir -p $(2)/bin
        $(CP)   $(PKG_INSTALL_DIR)/usr/bin/apr-1-config \
-               $(1)/usr/bin
+               $(2)/bin
        mkdir -p $(1)/usr/include/apr-1
        $(CP)   $(PKG_INSTALL_DIR)/usr/include/apr-1/* \
                $(1)/usr/include/apr-1/
        mkdir -p $(1)/usr/lib
-       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libapr-1.{a,so*} \
+       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libapr-1.{la,a,so*} \
                $(1)/usr/lib/
        mkdir -p $(1)/usr/lib/pkgconfig
        $(CP)   $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-1.pc \
@@ -66,11 +66,12 @@ define Build/InstallDev
        mkdir -p $(1)/usr/share/build-1
        $(CP)   $(PKG_INSTALL_DIR)/usr/share/build-1/* \
                $(1)/usr/share/build-1/
-       $(SED) 's,^datadir=\"/usr/share\",datadir=\"$(1)/usr/share\",g' $(1)/usr/bin/apr-1-config
-       $(SED) 's,^installbuilddir=\"/usr/share/build-1\",installbuilddir=\"$(1)/usr/share/build-1\",g' $(1)/usr/bin/apr-1-config
-       $(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(1)/usr/include/,g' $(1)/usr/bin/apr-1-config
-       $(SED) 's,-L$$$$libdir,,g' $(1)/usr/bin/apr-1-config
-       $(SED) 's,-R$$$$libdir,,g' $(1)/usr/bin/apr-1-config
+       $(SED) 's,^datadir=\"/usr/share\",datadir=\"$(1)/usr/share\",g' $(2)/bin/apr-1-config
+       $(SED) 's,^installbuilddir=\"/usr/share/build-1\",installbuilddir=\"$(1)/usr/share/build-1\",g' $(2)/bin/apr-1-config
+       $(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(1)/usr/lib,g' $(2)/bin/apr-1-config
+       $(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(1)/usr/include/,g' $(2)/bin/apr-1-config
+       $(SED) 's,-L$$$$libdir,,g' $(2)/bin/apr-1-config
+       $(SED) 's,-R$$$$libdir,,g' $(2)/bin/apr-1-config
        $(SED) 's,/usr/share/build-1,$(1)/usr/share/build-1,g' $(1)/usr/share/build-1/apr_rules.mk
 endef
 

diff --git a/net/apache/Makefile b/net/apache/Makefile
index 39dc91d19abd63c1c40616a17d43f84c32b39b11..b468a654be99223797f3f696bb9ca34c314d59ad 100644 (file)
--- a/net/apache/Makefile
+++ b/net/apache/Makefile
@@ -80,8 +80,8 @@ endef
 
 define Build/Configure 
        $(call Build/Configure/Default, \
-               --with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
-               --with-apr-util="$(STAGING_DIR)/usr/bin/apu-1-config" \
+               --with-apr="$(STAGING_DIR_HOST)/bin/apr-1-config" \
+               --with-apr-util="$(STAGING_DIR_HOST)/bin/apu-1-config" \
                --with-pcre="$(STAGING_DIR)/usr/bin/pcre-config" \
                --enable-http \
                --enable-ssl \