fix avr32 compiling

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

diff --git a/libs/libiconv/Makefile b/libs/libiconv/Makefile
index a00646e9460229f382363d2367367580fadb4ca1..e0b9b57af926d041637be23570280d13575107ef 100644 (file)
--- a/libs/libiconv/Makefile
+++ b/libs/libiconv/Makefile
@@ -1,3 +1,4 @@
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -10,53 +11,49 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=libiconv
 PKG_VERSION:=1.9.1
 PKG_RELEASE:=1
-PKG_MD5SUM:=0c99a05e0c3c153bac1c960f78711155
 
-PKG_SOURCE_URL:=@GNU/libiconv
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
+PKG_SOURCE_URL:=@GNU/libiconv
+PKG_MD5SUM:=0c99a05e0c3c153bac1c960f78711155
 
-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
 
 define Package/libiconv
   SECTION:=libs
   CATEGORY:=Libraries
-  TITLE:=character set conversion library
-  DESCRIPTION:=character set conversion library
+  TITLE:=Character set conversion library
   URL:=http://www.gnu.org/software/libiconv/
 endef
 
+CONFIGURE_ARGS += \
+       --enable-shared \
+       --enable-static \
+       --disable-rpath \
+
+define Build/Configure
+       $(call Build/Configure/Default)
+endef
+
 define Build/Compile
+       $(MAKE) -C $(PKG_BUILD_DIR) CC="$(TARGET_CC)"
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC="$(TARGET_CC)"
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               libdir="$(PKG_INSTALL_DIR)/usr/lib" \
                includedir="$(PKG_INSTALL_DIR)/usr/include" \
+               libdir="$(PKG_INSTALL_DIR)/usr/lib" \
                install-lib
 endef
 
-define Package/libiconv/install
-       install -d -m0755 $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.so* $(1)/usr/lib/
-       chmod 0644 $(1)/usr/lib/*
-endef
-
 define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/include/
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/iconv.h $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.* $(STAGING_DIR)/usr/lib/
+       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 Build/UninstallDev      
-       rm -rf \
-               $(STAGING_DIR)/usr/include/iconv.h \
-               $(STAGING_DIR)/usr/lib/libiconv.*
+define Package/libiconv/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libiconv))