[packages] Various Makefile cleanups.

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

diff --git a/libs/gettext/Makefile b/libs/gettext/Makefile
index 8121ab0474e541bd05e2fe3f53c3c119d48cc09e..1e4e39bba4825975e2ed01d944c64d8d19362f01 100644 (file)
--- a/libs/gettext/Makefile
+++ b/libs/gettext/Makefile
@@ -4,13 +4,12 @@
 # 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_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/gettext
@@ -43,19 +42,23 @@ CONFIGURE_ARGS += \
        --without-emacs
 
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
+       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all
 endef
 
-define Build/InstallDev        
+define Build/Install
+       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+endef
+
+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/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.{a,so*} $(1)/usr/lib/libintl/lib/
 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))