Remove tons of old uClibc/installer system related stuff.

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

diff --git a/lfs/gettext b/lfs/gettext
index 43e7552f3cda7602ab3f41511d16ecb32e2c926d..f713def0ae4cfa6e3c5dfd15d81b077f4401c51b 100644 (file)
--- a/lfs/gettext
+++ b/lfs/gettext
@@ -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
@@ -88,18 +84,9 @@ $(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