[packages] gettext: Install m4 files. Fixes #6591

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

diff --git a/libs/gettext/Makefile b/libs/gettext/Makefile
index ab620d7d6f11c8f235b813f8ae07348fdff7f646..ce3656e26b6b66e6f7a18462fa1c619363ad4793 100644 (file)
--- a/libs/gettext/Makefile
+++ b/libs/gettext/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# 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.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -9,16 +9,18 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gettext
 PKG_VERSION:=0.16.1
 
 PKG_NAME:=gettext
 PKG_VERSION:=0.16.1

-PKG_RELEASE:=4
+PKG_RELEASE:=5

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/gettext
 PKG_MD5SUM:=3d9ad24301c6d6b17ec30704a13fe127
 
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/gettext
 PKG_MD5SUM:=3d9ad24301c6d6b17ec30704a13fe127
 

-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

+

 define Package/libintl
   SECTION:=libs
   CATEGORY:=Libraries
 define Package/libintl
   SECTION:=libs
   CATEGORY:=Libraries


@@ -41,19 +43,16 @@ CONFIGURE_ARGS += \
        --without-libexpat-prefix \
        --without-emacs
 
        --without-libexpat-prefix \
        --without-emacs
 

-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all
-endef
-
-define Build/Install
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
-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/
        $(INSTALL_DIR) $(1)/usr/lib/libintl/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.{a,so*} $(1)/usr/lib/libintl/lib/
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/lib/libintl/include
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/include/libintl.h $(1)/usr/lib/libintl/include/
        $(INSTALL_DIR) $(1)/usr/lib/libintl/lib
        $(CP) $(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
 endef
 
 define Package/libintl/install