nochmal eine kleine Anpassung damit die resolv.conf bei Benutzung von red auch wieder...

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

diff --git a/lfs/bash b/lfs/bash
index e5aa78095695ebb69089a663e06cc40f49e4a052..693d2da0a32e770ff44eb74e1a6f535c4f221a55 100644 (file)
--- a/lfs/bash
+++ b/lfs/bash
@@ -44,7 +44,8 @@ ifeq "$(ROOT)" ""
   EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=/tools --without-bash-malloc --disable-nls
+  EXTRA_CONFIG = --prefix=/tools --without-bash-malloc \
+    --disable-nls
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
 endif
@@ -87,9 +88,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-3.1-fixes-8.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fixes-8.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-login.patch
        cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
-       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_APP) && make $(EXTRA_MAKE)
        cd $(DIR_APP) && make $(EXTRA_INSTALL) install
        ln -sf bash /bin/sh
 ifneq "$(ROOT)" ""