X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/cb11efc85b0b404eb4bf01cce6cd857e491f2628..2dcd7a2b09ae9f95fbd9787f0243709162998fc8:/include/package.mk

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