summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-08-22 16:15:00 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-08-22 16:15:00 +0000
commit77927a30adde8199545f804b167675685eeb5279 (patch)
treea824cf421e75575ace3a59c953a3a3b4fb8b2c85 /include
parentad58693506682743774e38f93db43862ec5f09da (diff)
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
Diffstat (limited to 'include')
-rw-r--r--include/package.mk6
1 files changed, 3 insertions, 3 deletions
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