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

SVN-Revision: 8462

diff --git a/include/package.mk b/include/package.mk
index b99f0c74cb8d25c754e63294743bc1810dc47224..1f4d8878ec713bfb58cc0f67f7791f06aaae9963 100644 (file)
--- a/include/package.mk
+++ b/include/package.mk
@@ -103,15 +103,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/libdir
+define libtool_fixup_libdir
        find $(PKG_BUILD_DIR) -name '*.la' | xargs \
-               $(SED) "s,^libdir='/usr/lib',libdir='$(STAGING_DIR)/usr/lib',g"
+               $(SED) "s,^libdir='/usr/lib',libdir='$(strip $(1))/usr/lib',g"
 endef
 
 define Build/Prepare