X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fgettext;h=3896ec12f1dc41a1a740fd2fa4bd15e8296bcd1f;hb=a79b220c5a6ad33126276958a506befe8b437a25;hp=e28d5e04681cf407f2c88b88f8cdd448c69df756;hpb=cd1a2927226c734d96478e12bb768256fb64a06a;p=ipfire-2.x.git

diff --git a/lfs/gettext b/lfs/gettext
index e28d5e0468..3896ec12f1 100644
--- a/lfs/gettext
+++ b/lfs/gettext
@@ -1,28 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2016   IPFire Team  <info@ipfire.org>                    #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# 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 $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,11 +24,11 @@
 
 include Config
 
-VER        = 0.14.1
+VER        = 0.19.8.1
 
 THISAPP    = gettext-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_GNU)/gettext
+DL_FILE    = $(THISAPP).tar.xz
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 # Normal build or /tools build.
@@ -44,11 +36,11 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr --disable-nls
-  EXTRA_MAKE =
+  EXTRA_MAKE = 
   EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=/tools --disable-nls
+  EXTRA_CONFIG = --prefix=/tools --disable-shared --disable-nls --build=$(BUILDTARGET)
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
 endif
@@ -61,7 +53,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 78f4b862510beb2e5d43223dd610e77d
+$(DL_FILE)_MD5 = df3f5690eaa30fd228537b00cb7b7590
 
 install : $(TARGET)
 
@@ -90,9 +82,17 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ifeq "$(ROOT)" ""
 	cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
 	cd $(DIR_APP) && make $(EXTRA_MAKE)
 	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+else
+	cd $(DIR_APP)/gettext-tools && ./configure $(EXTRA_CONFIG)
+	cd $(DIR_APP)/gettext-tools && make -C gnulib-lib
+	cd $(DIR_APP)/gettext-tools && make -C intl pluralx.c
+	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)