From: Nicolas Thill Date: Sun, 13 Apr 2008 18:20:42 +0000 (+0000) Subject: fix path to apr-1-config & apu-1-config (closes: #3113) X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=391aa36659dc4ceb51f9dbf716af7a0e1a49307c;p=openwrt%2Fsvn-archive%2Farchive.git fix path to apr-1-config & apu-1-config (closes: #3113) SVN-Revision: 10822 --- diff --git a/libs/apr-util/Makefile b/libs/apr-util/Makefile index 6f09d2f48d..1c933711da 100644 --- a/libs/apr-util/Makefile +++ b/libs/apr-util/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007 OpenWrt.org +# Copyright (C) 2007-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -31,7 +31,7 @@ endef CONFIGURE_ARGS += \ --with-pgsql=no \ - --with-apr="$(STAGING_DIR)/host/bin/apr-1-config" \ + --with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \ --with-expat="$(STAGING_DIR)/usr" \ --without-sqlite2 \ --with-sqlite3="$(STAGING_DIR)/usr" \ @@ -47,20 +47,20 @@ define Build/Compile endef define Build/InstallDev - $(INSTALL_DIR) $(2)/bin $(1)/usr/include/apr-1/ $(1)/usr/lib $(1)/usr/lib/pkgconfig/ + $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1/ $(1)/usr/lib $(1)/usr/lib/pkgconfig/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/apu-1-config \ - $(2)/bin + $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* \ $(1)/usr/include/apr-1/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{la,a,so*} \ $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-util-1.pc \ $(1)/usr/lib/pkgconfig/ - $(SED) 's, -e \"s -I$$$$prefix/lib g\",,g' $(2)/bin/apu-1-config - $(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' $(2)/bin/apu-1-config - $(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/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 + $(SED) 's, -e \"s -I$$$$prefix/lib g\",,g' $(1)/usr/bin/apu-1-config + $(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' $(1)/usr/bin/apu-1-config + $(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/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 endef define Package/libaprutil/install diff --git a/libs/apr/Makefile b/libs/apr/Makefile index 61821162ea..a9394dc7ac 100644 --- a/libs/apr/Makefile +++ b/libs/apr/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007 OpenWrt.org +# Copyright (C) 2007-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -46,9 +46,9 @@ define Build/Compile endef define Build/InstallDev - $(INSTALL_DIR) $(2)/bin $(1)/usr/include/apr-1 $(1)/usr/lib $(1)/usr/lib/pkgconfig $(1)/usr/share/build-1 + $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1 $(1)/usr/lib $(1)/usr/lib/pkgconfig $(1)/usr/share/build-1 $(CP) $(PKG_INSTALL_DIR)/usr/bin/apr-1-config \ - $(2)/bin + $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* \ $(1)/usr/include/apr-1/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.{la,a,so*} \ @@ -57,12 +57,12 @@ define Build/InstallDev $(1)/usr/lib/pkgconfig/ $(CP) $(PKG_INSTALL_DIR)/usr/share/build-1/* \ $(1)/usr/share/build-1/ - $(SED) 's,^datadir=\"/usr/share\",datadir=\"$(STAGING_DIR)/usr/share\",g' $(2)/bin/apr-1-config - $(SED) 's,^installbuilddir=\"/usr/share/build-1\",installbuilddir=\"$(STAGING_DIR)/usr/share/build-1\",g' $(2)/bin/apr-1-config - $(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' $(2)/bin/apr-1-config - $(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/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,^datadir=\"/usr/share\",datadir=\"$(STAGING_DIR)/usr/share\",g' $(1)/usr/bin/apr-1-config + $(SED) 's,^installbuilddir=\"/usr/share/build-1\",installbuilddir=\"$(STAGING_DIR)/usr/share/build-1\",g' $(1)/usr/bin/apr-1-config + $(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' $(1)/usr/bin/apr-1-config + $(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/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,/usr/share/build-1,$(STAGING_DIR)/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 47dbcd0658..9fd291cca5 100644 --- a/net/apache/Makefile +++ b/net/apache/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007 OpenWrt.org +# Copyright (C) 2007-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -80,9 +80,9 @@ endef define Build/Configure $(call Build/Configure/Default, \ - --with-apr="$(STAGING_DIR)/host/bin/apr-1-config" \ - --with-apr-util="$(STAGING_DIR)/host/bin/apu-1-config" \ - --with-pcre="$(STAGING_DIR)/host/bin/pcre-config" \ + --with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \ + --with-apr-util="$(STAGING_DIR)/usr/bin/apu-1-config" \ + --with-pcre="$(STAGING_DIR)/usr/bin/pcre-config" \ --enable-http \ --enable-ssl \ --enable-proxy \ diff --git a/net/subversion/Makefile b/net/subversion/Makefile index d26cce30db..ca3ef2d28a 100644 --- a/net/subversion/Makefile +++ b/net/subversion/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007 OpenWrt.org +# Copyright (C) 2007-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -47,8 +47,8 @@ define Package/subversion-server endef CONFIGURE_ARGS += \ - --with-apr="$(STAGING_DIR)/host/bin/apr-1-config" \ - --with-apr-util="$(STAGING_DIR)/host/bin/apu-1-config" \ + --with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \ + --with-apr-util="$(STAGING_DIR)/usr/bin/apu-1-config" \ --with-neon="$(STAGING_DIR)/usr/include/neon" \ --disable-mod-activation \ --without-ruby-sitedir \