Merge remote-tracking branch 'origin/next' into thirteen

[ipfire-2.x.git] / lfs / gettext

diff --git a/lfs/gettext b/lfs/gettext
index 43e7552f3cda7602ab3f41511d16ecb32e2c926d..b1ccbbebde4ade84bc7725d08cb8df2820a9911a 100644 (file)
--- a/lfs/gettext
+++ b/lfs/gettext
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.14.5
+VER        = 0.18.1.1
 
 THISAPP    = gettext-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,14 +34,10 @@ 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_INSTALL =
-endif
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
   EXTRA_CONFIG = --prefix=/tools --disable-shared --disable-nls
@@ -57,7 +53,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e2f6581626a22a0de66dce1d81d00de3
+$(DL_FILE)_MD5 = 3dd55b952826d2b32f51308f2f91aa89
 
 install : $(TARGET)
 
@@ -88,21 +84,12 @@ $(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 gnulib-lib
        cd $(DIR_APP)/gettext-tools && make -C src msgfmt
        cd $(DIR_APP)/gettext-tools && cp -v src/msgfmt /tools/bin
 endif