X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fgettext;h=8a5cd4bf9966c8e13760558aa5e6ba52344a0f07;hb=14cc7eac2ecc5ec2cb3c97fa734a3fe9a88f53f5;hp=e28d5e04681cf407f2c88b88f8cdd448c69df756;hpb=cd1a2927226c734d96478e12bb768256fb64a06a;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/gettext b/lfs/gettext
index e28d5e0468..8a5cd4bf99 100644
--- a/lfs/gettext
+++ b/lfs/gettext
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: gettext,v 1.3.2.3 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,23 +26,27 @@
 
 include Config
 
-VER        = 0.14.1
+VER        = 0.14.5
 
 THISAPP    = gettext-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_GNU)/gettext
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 # Normal build or /tools build.
 #
 ifeq "$(ROOT)" ""
+ifeq "$(LFS_PASS)" "install"
+  TARGET = $(DIR_INFO)/$(THISAPP)-install
+else
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr --disable-nls
-  EXTRA_MAKE =
+  EXTRA_MAKE = 
   EXTRA_INSTALL =
+endif
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=/tools --disable-nls
+  EXTRA_CONFIG = --prefix=/tools --disable-shared --disable-nls
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
 endif
@@ -61,7 +59,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 78f4b862510beb2e5d43223dd610e77d
+$(DL_FILE)_MD5 = e2f6581626a22a0de66dce1d81d00de3
 
 install : $(TARGET)
 
@@ -91,8 +89,24 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ifeq "$(ROOT)" ""
+ifeq "$(LFS_PASS)" "install"
+	cd $(DIR_APP) && ./configure --prefix=/ --libdir=/lib \
+				--with-included-gettext --disable-rpath \
+				--enable-relocatable --disable-shared
+	cd $(DIR_APP)/gettext-runtime && make CFLAGS="-Os -fomit-frame-pointer" -C intl/
+	cd $(DIR_APP)/gettext-runtime && make CFLAGS="-Os -fomit-frame-pointer" \
+				DESTDIR=/opt/$(MACHINE)-uClibc -C intl/ install
+else
 	cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
 	cd $(DIR_APP) && make $(EXTRA_MAKE)
 	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+endif
+else
+	cd $(DIR_APP)/gettext-tools && ./configure $(EXTRA_CONFIG)
+	cd $(DIR_APP)/gettext-tools && make -C lib
+	cd $(DIR_APP)/gettext-tools && make -C src msgfmt
+	cd $(DIR_APP)/gettext-tools && cp -v src/msgfmt /tools/bin
+endif
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)