zlib: Fix name of logfile in toolchain build

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

diff --git a/lfs/flex b/lfs/flex
index 4b1a75b098c5b890d95eec73e9d801ef9ca91931..4037e93e452ae0c67ef8fe9bbebab6c51220bbb8 100644 (file)
--- a/lfs/flex
+++ b/lfs/flex
@@ -30,7 +30,15 @@ THISAPP    = flex-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
+
+# Normal build or $(TOOLS_DIR) build.
+#
+ifeq "$(ROOT)" ""
+  TARGET = $(DIR_INFO)/$(THISAPP)
+else
+  TARGET = $(DIR_INFO)/$(THISAPP)-tools
+endif
+
 
 ###############################################################################
 # Top-level Rules
@@ -70,10 +78,11 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && HELP2MAN=/tools/bin/true \
-               ./configure --prefix=/usr --disable-nls
-       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-       cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+       cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/flex-2.6.4-fix-build-width-glibc-2.6+.patch
+       cd $(DIR_APP) && HELP2MAN=$(TOOLS_DIR)/bin/true \
+               ./configure --prefix=$(PREFIX) --disable-nls
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
 ifeq "$(ROOT)" ""
        ln -sfv libfl.a /usr/lib/libl.a
        echo "#!/bin/sh"                        >  /usr/bin/lex