[packages/gnutls] append rpath-link line to linker flags

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

diff --git a/libs/gettext/Makefile b/libs/gettext/Makefile
index a3c9479b42f006df2c41d2c040b83333d091446b..f7c4daa436b55897c562284a1114b807906604c1 100644 (file)
--- a/libs/gettext/Makefile
+++ b/libs/gettext/Makefile
@@ -1,20 +1,22 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gettext
-PKG_VERSION:=0.16.1
-PKG_RELEASE:=2
+PKG_VERSION:=0.17
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/gettext
-PKG_MD5SUM:=3d9ad24301c6d6b17ec30704a13fe127
+PKG_MD5SUM:=58a2bc6d39c0ba57823034d55d65d606
+
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -25,6 +27,8 @@ define Package/libintl
   URL:=http://www.gnu.org/software/gettext/
 endef
 
+TARGET_CFLAGS += $(FPIC)
+
 CONFIGURE_ARGS += \
        --enable-shared \
        --enable-static \
@@ -38,27 +42,20 @@ CONFIGURE_ARGS += \
        --without-libexpat-prefix \
        --without-emacs
 
-define Build/Configure
-       $(call Build/Configure/Default)
-       $(call libtool_disable_rpath)
-endef
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/lib/libintl/include
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/include/libintl.h $(1)/usr/lib/libintl/include/
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) all
-       $(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
-endef
+       $(INSTALL_DIR) $(1)/usr/lib/libintl/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.{a,so*} $(1)/usr/lib/libintl/lib/
 
-define Build/InstallDev        
-       mkdir -p $(1)/usr/lib/libintl/include
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/include/libintl.h $(1)/usr/lib/libintl/include/
-       mkdir -p $(1)/usr/lib/libintl/lib
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libintl.{a,so*} $(1)/usr/lib/libintl/lib/
+       $(INSTALL_DIR) $(1)/usr/share/aclocal
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/aclocal/* $(1)/usr/share/aclocal/
 endef
 
 define Package/libintl/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libintl.so.* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libintl))