X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fbash;h=99a293dbb6b9753ccb6e3f6c1ad5ab0a21a76bd9;hb=2723ef8721862b9d9565346bae8115773123e53e;hp=c215b5a32c71e2cabb1a0bf77656c4f18384de5a;hpb=1a01c170110374afcc6b7cfe26e63623e4f3aabb;p=ipfire-2.x.git

diff --git a/lfs/bash b/lfs/bash
index c215b5a32c..99a293dbb6 100644
--- a/lfs/bash
+++ b/lfs/bash
@@ -31,7 +31,7 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
-# Normal build or /tools build.
+# Normal build or $(TOOLS_DIR) build.
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
@@ -39,7 +39,7 @@ ifeq "$(ROOT)" ""
     --with-installed-readline
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  CONFIGURE_OPTIONS = --prefix=/tools
+  CONFIGURE_OPTIONS = --prefix=$(TOOLS_DIR)
 endif
 
 CONFIGURE_OPTIONS += \
@@ -99,13 +99,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
-	ln -sf bash /bin/sh
+ifeq "$(TOOLCHAIN)" "1"
+	ln -svf bash $(TOOLS_DIR)/bin/sh
 
-ifneq "$(ROOT)" ""
-	-mkdir -p $(ROOT)/bin
-	-mkdir -p $(ROOT)/usr/bin
-	ln -sf bash /tools/bin/sh
-	-ln -sf /tools/bin/bash $(ROOT)/bin/sh
+	mkdir -pv $(ROOT)/bin
+	ln -svf ..$(TOOLS_DIR)/bin/bash $(ROOT)/bin/sh
+else
+	ln -svf bash /bin/sh
 endif
 
 	@rm -rf $(DIR_APP)