From: Nicolas Thill <nico@openwrt.org>
Date: Wed, 22 Aug 2007 16:15:00 +0000 (+0000)
Subject: rename libtool macros, revert [8461], make install prefix configurable in libtool_fix... 
X-Git-Tag: 8.09_rc1~2906
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b4318f53f9b7812814959b33ed04364a3b192618;p=openwrt%2Fsvn-archive%2Fopenwrt.git

rename libtool macros, revert [8461], make install prefix configurable in libtool_fixup_libdir

SVN-Revision: 8462
---

diff --git a/include/package.mk b/include/package.mk
index a13b6a2cee..c928c310dd 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -105,15 +105,15 @@ endif
 endef
 
 # prevent libtool from setting rpath when linking
-define Build/Fix/libtool/rpath
+define libtool_disable_rpath
 	find $(PKG_BUILD_DIR) -name 'libtool' | xargs \
 		$(SED) 's,^hardcode_libdir_flag_spec=.*,hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ ",g'
 endef
 
 # prevent libtool from linking against host development libraries
-define Build/Fix/libtool
+define libtool_fixup_libdir
 	find $(PKG_BUILD_DIR) -name '*.la' | xargs \
-		$(SED) "s,^$(1)='/usr/lib',$(1)='$(STAGING_DIR)/usr/lib',g"
+		$(SED) "s,^libdir='/usr/lib',libdir='$(strip $(1))/usr/lib',g"
 endef
 
 define Build/Prepare