From 72e623bbc7a658f03cea6875392b9b40eebe8a01 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Tue, 12 Jan 2010 21:21:39 +0100
Subject: scripts/crosstool-ng: Change overide bin dir

Change the overide bin dir so it can be used by companion tools

Signed-off-by: Richard Strand <richard.strand@icomera.com>
[yann.morin.1998@anciens.enib.fr: more generic overide tools dir]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in
index ffe16f1..1243445 100644
--- a/scripts/crosstool-NG.sh.in
+++ b/scripts/crosstool-NG.sh.in
@@ -77,17 +77,17 @@ CT_TestOrAbort "The CONFIG_SHELL '${CT_CONFIG_SHELL}' (${CT_SHELL}) is not valid
 # Contains symlinks to the tools found by ./configure
 # Note: CT_DoLog and CT_DoExecLog do not use any of those tool, so
 # they can be safely used
-CT_BIN_OVERIDE_DIR="${CT_WORK_DIR}/bin"
-CT_DoLog DEBUG "Creating bin-overide for tools in '${CT_BIN_OVERIDE_DIR}'"
-CT_DoExecLog DEBUG mkdir -p "${CT_BIN_OVERIDE_DIR}"
+CT_TOOLS_OVERIDE_DIR="${CT_WORK_DIR}/tools"
+CT_DoLog DEBUG "Creating bin-overide for tools in '${CT_TOOLS_OVERIDE_DIR}'"
+CT_DoExecLog DEBUG mkdir -p "${CT_TOOLS_OVERIDE_DIR}/bin"
 cat "${CT_LIB_DIR}/paths.mk" |while read trash line; do
     tool="${line%%=*}"
     path="${line#*=}"
     CT_DoLog DEBUG "Creating script-override for '${tool}' -> '${path}'"
-    printf "#${BANG}${CT_SHELL}\nexec '${path}' \"\${@}\"\n" >"${CT_BIN_OVERIDE_DIR}/${tool}"
-    CT_DoExecLog ALL chmod 700 "${CT_BIN_OVERIDE_DIR}/${tool}"
+    printf "#${BANG}${CT_SHELL}\nexec '${path}' \"\${@}\"\n" >"${CT_TOOLS_OVERIDE_DIR}/bin/${tool}"
+    CT_DoExecLog ALL chmod 700 "${CT_TOOLS_OVERIDE_DIR}/bin/${tool}"
 done
-export PATH="${CT_BIN_OVERIDE_DIR}:${PATH}"
+export PATH="${CT_TOOLS_OVERIDE_DIR}/bin:${PATH}"
 
 # Start date. Can't be done until we know the locale
 # Also requires the bin-override tools
-- 
cgit v0.10.2-6-g49f6