]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
bash: Correctly create link to /bin/sh
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 May 2017 11:29:54 +0000 (12:29 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 May 2017 11:29:54 +0000 (12:29 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
lfs/bash

index c215b5a32c71e2cabb1a0bf77656c4f18384de5a..6e09c5b1b770216e48126b6624accc8444b6fe12 100644 (file)
--- a/lfs/bash
+++ b/lfs/bash
@@ -99,13 +99,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 
-       ln -sf bash /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
+ifeq "$(TOOLCHAIN)" "1"
+       ln -svf bash /tools/bin/sh
+else
+       ln -svf bash /bin/sh
 endif
 
        @rm -rf $(DIR_APP)