libtool: don't clobber host libtool infrastructure

[openwrt/openwrt.git] / package / libs / libtool / Makefile

diff --git a/package/libs/libtool/Makefile b/package/libs/libtool/Makefile
index 8091081f9688a533b9d5aeac3fd1684c9aa7e4b1..5eb521a72bfdd8a971c9eb007371ecaa3a924e42 100644 (file)
--- a/package/libs/libtool/Makefile
+++ b/package/libs/libtool/Makefile
@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtool
 PKG_VERSION:=2.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/libtool
-PKG_MD5SUM:=b32b04148ecdd7344abc6fe8bd1bb021
+PKG_HASH:=afcce660d3dc54c63a0a5ba3cf05272239dc3c54bbeba20f6bad250f9dc007ae
 
 PKG_LICENSE:=GPL-2.0+
 PKG_LICENSE_FILES:=COPYING
@@ -22,7 +22,7 @@ PKG_BUILD_PARALLEL:=0
 
 include $(INCLUDE_DIR)/package.mk
 
-CONFIGURE_PREFIX=$(STAGING_DIR)/host
+CONFIGURE_PREFIX=$(STAGING_DIR_HOSTPKG)
 export GLOBAL_LIBDIR=$(STAGING_DIR)/usr/lib
 
 define Package/libltdl
@@ -34,14 +34,14 @@ endef
 
 define Build/InstallDev
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               bindir="$(2)/bin" \
-               datadir="$(2)/share" \
-               prefix="$(2)" \
-               exec_prefix="$(2)" \
+               bindir="$(2)/libltdl/bin" \
+               datadir="$(2)/libltdl/share" \
+               prefix="$(2)/libltdl" \
+               exec_prefix="$(2)/libltdl" \
                install
        $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/include
-       mv $(2)/lib/* $(1)/usr/lib/
-       mv $(2)/include/* $(1)/usr/include/
+       mv $(2)/libltdl/lib/* $(1)/usr/lib/
+       mv $(2)/libltdl/include/* $(1)/usr/include/
 endef
 
 define Package/libltdl/install