fix avr32 compiling

[openwrt/svn-archive/archive.git] / libs / libiconv / Makefile

diff --git a/libs/libiconv/Makefile b/libs/libiconv/Makefile
index 997517c6e26e1da0f87505adec8e0d1751d98722..e0b9b57af926d041637be23570280d13575107ef 100644 (file)
--- a/libs/libiconv/Makefile
+++ b/libs/libiconv/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/libiconv
 PKG_MD5SUM:=0c99a05e0c3c153bac1c960f78711155
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libiconv
@@ -32,12 +34,10 @@ CONFIGURE_ARGS += \
 
 define Build/Configure
        $(call Build/Configure/Default)
-       $(call libtool_disable_rpath)
 endef
 
 define Build/Compile
        $(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" \
@@ -45,14 +45,10 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/lib/libiconv/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/iconv.h $(STAGING_DIR)/usr/lib/libiconv/include/
-       mkdir -p $(STAGING_DIR)/usr/lib/libiconv/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.{a,so*} $(STAGING_DIR)/usr/lib/libiconv/lib/
-endef
-
-define Build/UninstallDev      
-       rm -rf  $(STAGING_DIR)/usr/lib/libiconv
+       mkdir -p $(1)/usr/lib/libiconv/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/iconv.h $(1)/usr/lib/libiconv/include/
+       mkdir -p $(1)/usr/lib/libiconv/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.{a,so*} $(1)/usr/lib/libiconv/lib/
 endef
 
 define Package/libiconv/install