fix avr32 compiling

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

diff --git a/libs/libiconv/Makefile b/libs/libiconv/Makefile
index 6f3524bde389276122ba02b2e2f06600d40e788b..e0b9b57af926d041637be23570280d13575107ef 100644 (file)
--- a/libs/libiconv/Makefile
+++ b/libs/libiconv/Makefile
@@ -15,10 +15,8 @@ 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
+PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -29,37 +27,32 @@ 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 \
-               --with-gnu-ld \
-       )
+       $(call Build/Configure/Default)
 endef
 
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC="$(TARGET_CC)"
+       $(MAKE) -C $(PKG_BUILD_DIR) CC="$(TARGET_CC)"
        $(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
-       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
-       install -d -m0755 $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.so.* $(1)/usr/lib/
 endef