[packages] Various Makefile cleanup.

[openwrt-10.03/.git] / package / libtool / Makefile

diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index bf9e520da7d13a97586bfd84c74a431915f635da..7c5e431ea393d3760ea4a724bcb0fcea2d8d6bd4 100644 (file)
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -15,8 +15,6 @@ 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
@@ -25,7 +23,6 @@ include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 
 CONFIGURE_PREFIX=$(STAGING_DIR)/host
-CONFIGURE_VARS+= CXX=no
 export GLOBAL_LIBDIR=$(STAGING_DIR)/usr/lib
 
 define Package/libltdl
@@ -46,6 +43,8 @@ define Build/InstallDev
        mv $(2)/lib/* $(1)/usr/lib/
        mv $(2)/include/* $(1)/usr/include/
        $(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