X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fmake;h=bee734ba4de736c568a6bba3587143548ba046ab;hb=ef640882ab4ff5f26fb7b4bf9a5f00ca4f94d172;hp=979357eca3ef95059ce45f89c2bcfd77ca0158e7;hpb=5b117ef49aaad5f39a81938783b2cfe05fc5d91c;p=ipfire-2.x.git

diff --git a/lfs/make b/lfs/make
index 979357eca3..bee734ba4d 100644
--- a/lfs/make
+++ b/lfs/make
@@ -39,14 +39,8 @@ DEPS       = ""
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --disable-nls
-  EXTRA_MAKE =
-  EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
 endif
 
 ifeq "$(PASS)" "1"
@@ -94,8 +88,10 @@ $(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) && ./configure $(EXTRA_CONFIG)
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+	cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/make-4.2.1-glob-build-fix.patch
+	cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/make-4.2.1-glob-SEGV.patch
+	cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)