From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
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-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=77927a30adde8199545f804b167675685eeb5279;hp=ad58693506682743774e38f93db43862ec5f09da

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


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8462 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/include/package.mk b/include/package.mk
index a13b6a2ce..c928c310d 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