upgrade libtool, add fixes for libdir searching, fix up paths to .la files

[librecmc/librecmc.git] / package / libtool / Makefile

diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index 1aad641986e6960910edc38a99d08519ed196b84..c3feb9ec8b1595c50a0d9ca5aa9c6e7df7347075 100644 (file)
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtool
-PKG_VERSION:=1.5.22
+PKG_VERSION:=1.5.24
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -21,6 +21,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 include $(INCLUDE_DIR)/package.mk
 
 CONFIGURE_PREFIX=$(STAGING_DIR)/host
+export GLOBAL_LIBDIR=$(STAGING_DIR)/usr/lib
 
 define Package/libltdl
   SECTION:=libs
@@ -31,11 +32,17 @@ endef
 
 define Build/InstallDev
        $(MAKE) -C $(PKG_BUILD_DIR) \
+               bindir="$(2)/bin" \
+               datadir="$(2)/share" \
                prefix="$(2)" \
                exec_prefix="$(2)" \
                install
        $(INSTALL_DIR) $(1)/lib
        mv $(2)/lib/* $(1)/lib/
+#      $(SED) 's,^dlopen_self=unknown,dlopen_self=yes,' \
+#          -e 's,^dlopen_self_static=unknown,dlopen_self_static=no,' \
+#          -e 's,^link_all_deplibs=unknown,link_all_deplibs=no,' \
+#              $(2)/bin/libtool
 endef
 
 define Package/libltdl/install