From a1376a78f8eaa50a7d67297758ae0f42dfcd2cfe Mon Sep 17 00:00:00 2001
From: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Date: Fri, 3 Jun 2011 18:11:10 +0200
Subject: Packages: gettext: convert to fully use generic macros

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
---
 packages/misc/gettext/gettext.mk | 38 +++++++++++---------------------------
 1 file changed, 11 insertions(+), 27 deletions(-)

(limited to 'packages/misc')

diff --git a/packages/misc/gettext/gettext.mk b/packages/misc/gettext/gettext.mk
index c5b5839..2fb7fe1 100644
--- a/packages/misc/gettext/gettext.mk
+++ b/packages/misc/gettext/gettext.mk
@@ -23,14 +23,14 @@
 # \date         December 2009
 ################################################################################
 
-GETTEXT_NAME := gettext
-GETTEXT_VERSION := $(call EMBTK_GET_PKG_VERSION,GETTEXT)
-GETTEXT_SITE := http://ftp.gnu.org/pub/gnu/gettext
-GETTEXT_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-GETTEXT_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/gettext/$(GETTEXT_VERSION)
-GETTEXT_PACKAGE := gettext-$(GETTEXT_VERSION).tar.gz
-GETTEXT_SRC_DIR := $(PACKAGES_BUILD)/gettext-$(GETTEXT_VERSION)
-GETTEXT_BUILD_DIR := $(PACKAGES_BUILD)/gettext-$(GETTEXT_VERSION)
+GETTEXT_NAME		:= gettext
+GETTEXT_VERSION		:= $(call EMBTK_GET_PKG_VERSION,GETTEXT)
+GETTEXT_SITE		:= http://ftp.gnu.org/pub/gnu/gettext
+GETTEXT_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+GETTEXT_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/gettext/$(GETTEXT_VERSION)
+GETTEXT_PACKAGE		:= gettext-$(GETTEXT_VERSION).tar.gz
+GETTEXT_SRC_DIR		:= $(PACKAGES_BUILD)/gettext-$(GETTEXT_VERSION)
+GETTEXT_BUILD_DIR	:= $(PACKAGES_BUILD)/gettext-$(GETTEXT_VERSION)
 
 GETTEXT_BINS =	autopoint gettext gettext.sh msgcat msgcomm msgen	\
 		msgfilter msggrep msgmerge msguniq recode-sr-latin	\
@@ -41,11 +41,11 @@ GETTEXT_INCLUDES = autosprintf.h gettext-po.h libintl.h
 GETTEXT_LIBS = gettext libgettext* libasprintf* libintl*
 GETTEXT_PKGCONFIGS =
 
-GETTEXT_CONFIGURE_ENV := gl_cv_func_wcwidth_works=yes			\
+GETTEXT_CONFIGURE_ENV	:= gl_cv_func_wcwidth_works=yes			\
 			am_cv_func_iconv_works=yes			\
 			gt_cv_func_printf_posix=yes			\
 			gt_cv_int_divbyzero_sigfpe=no
-GETTEXT_CONFIGURE_OPTS := --enable-relocatable --with-included-gettext	\
+GETTEXT_CONFIGURE_OPTS	:= --enable-relocatable --with-included-gettext	\
 			--disable-rpath --disable-openmp --disable-java	\
 			--with-libxml2-prefix=$(SYSROOT)/usr		\
 			--disable-openmp
@@ -53,28 +53,12 @@ GETTEXT_CONFIGURE_OPTS := --enable-relocatable --with-included-gettext	\
 GETTEXT_DEPS = ncurses_install libxml2_install
 
 gettext_install:
-	@test -e $(GETTEXT_BUILD_DIR)/.installed || \
-	$(MAKE) $(GETTEXT_BUILD_DIR)/.installed
-
-$(GETTEXT_BUILD_DIR)/.installed: $(GETTEXT_DEPS) download_gettext \
-	$(GETTEXT_BUILD_DIR)/.decompressed $(GETTEXT_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
-	gettext-$(GETTEXT_VERSION) in your root filesystem...")
-	$(Q)$(MAKE) -C $(GETTEXT_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(GETTEXT_BUILD_DIR) DESTDIR=$(SYSROOT) install
-	$(Q)$(MAKE) libtool_files_adapt
+	$(call EMBTK_INSTALL_PKG,GETTEXT)
 	$(Q)$(MAKE) $(GETTEXT_BUILD_DIR)/.patchlibtool
-	@touch $@
 
 download_gettext:
 	$(call EMBTK_DOWNLOAD_PKG,GETTEXT)
 
-$(GETTEXT_BUILD_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_PKG,GETTEXT)
-
-$(GETTEXT_BUILD_DIR)/.configured:
-	$(call EMBTK_CONFIGURE_PKG,GETTEXT)
-
 gettext_clean:
 	$(call EMBTK_CLEANUP_PKG,GETTEXT)
 
-- 
cgit v1.2.3