Update for numerous lfs-files: removed deprecated configure options

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

diff --git a/lfs/bash b/lfs/bash
index c75895124590524f412a2072cb08393487c93d2b..99a293dbb6b9753ccb6e3f6c1ad5ab0a21a76bd9 100644 (file)
--- a/lfs/bash
+++ b/lfs/bash
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2014   IPFire Team   <info@ipfire.org>                   #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -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)