From: Nicolas Thill <nico@openwrt.org>
Date: Wed, 3 Oct 2007 07:21:33 +0000 (+0000)
Subject: add libtool fixes, cleanup
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=5f62e433f7215feddc4e09931c7c3b7889188397

add libtool fixes, cleanup


SVN-Revision: 9105
---

diff --git a/libs/libiconv/Makefile b/libs/libiconv/Makefile
index 168d552dee..997517c6e2 100644
--- a/libs/libiconv/Makefile
+++ b/libs/libiconv/Makefile
@@ -15,10 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/libiconv
 PKG_MD5SUM:=0c99a05e0c3c153bac1c960f78711155
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -29,21 +25,23 @@ define Package/libiconv
   URL:=http://www.gnu.org/software/libiconv/
 endef
 
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--disable-rpath \
+
 define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-shared \
-		--enable-static \
-		--disable-rpath \
-	)
+	$(call Build/Configure/Default)
+	$(call libtool_disable_rpath)
 endef
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)"
+	$(MAKE) -C $(PKG_BUILD_DIR) CC="$(TARGET_CC)"
+	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		includedir="$(PKG_INSTALL_DIR)/usr/include" \
 		libdir="$(PKG_INSTALL_DIR)/usr/lib" \
-		all install-lib
+		install-lib
 endef
 
 define Build/InstallDev