X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/eedfb2737930d49b326246c3ab42be6affc060f8..b4ca45931c08e23b81e7a2d3c5cf6fa3aea151ef:/package/libtool/Makefile

diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index 61726568b..7c5e431ea 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -16,8 +15,11 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/libtool
 PKG_MD5SUM:=d0071c890101fcf4f2be8934a37841b0
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+HOST_PATCH_DIR=/dev/null
 
+PKG_BUILD_DEPENDS:=libtool/host
+
+include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 
 CONFIGURE_PREFIX=$(STAGING_DIR)/host
@@ -37,11 +39,12 @@ define Build/InstallDev
 		prefix="$(2)" \
 		exec_prefix="$(2)" \
 		install
-	$(INSTALL_DIR) $(1)/lib $(1)/usr/include
-	mv $(2)/lib/* $(1)/lib/
+	$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/include
+	mv $(2)/lib/* $(1)/usr/lib/
 	mv $(2)/include/* $(1)/usr/include/
-	$(INSTALL_DIR) $(STAGING_DIR_HOST)/share/aclocal
-	mv $(2)/share/aclocal/* $(STAGING_DIR_HOST)/share/aclocal/
+	$(SED) 's,\(hardcode_into_libs\)=yes,\1=no,g' $(2)/bin/libtool
+	$(CP) $(2)/bin/libtool $(2)/bin/libtool-ucxx
+	$(SED) 's,-lstdc++,-luClibc++,g' $(2)/bin/libtool-ucxx
 endef
 
 define Package/libltdl/install
@@ -49,4 +52,5 @@ define Package/libltdl/install
 	$(CP) $(PKG_BUILD_DIR)/libltdl/.libs/libltdl.so.* $(1)/usr/lib/
 endef
 
+$(eval $(call HostBuild))
 $(eval $(call BuildPackage,libltdl))