diff options
| author | Nicolas Thill <nico@openwrt.org> | 2007-08-22 16:15:00 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2007-08-22 16:15:00 +0000 |
| commit | b4318f53f9b7812814959b33ed04364a3b192618 (patch) | |
| tree | e788a64bcfffa5c8bbc41005d97e4471a132f4cc | |
| parent | c994e41757e4953c0472de94c798123a8bf911b8 (diff) | |
| download | upstream-b4318f53f9b7812814959b33ed04364a3b192618.tar.gz upstream-b4318f53f9b7812814959b33ed04364a3b192618.tar.bz2 upstream-b4318f53f9b7812814959b33ed04364a3b192618.zip | |
rename libtool macros, revert [8461], make install prefix configurable in libtool_fixup_libdir
SVN-Revision: 8462
| -rw-r--r-- | include/package.mk | 6 |
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 |