Allow user to add a directory component in the sys-root path.

Rename CT_DEBUG_INSTALL_DIR to CT_DEBUGROOT_DIR (to match CT_SYSROOT_DIR).
As a side effect, fix creating lib64->lib symlinks.

 /trunk/scripts/build/debug/100-dmalloc.sh |    2     1     1     0 +-
 /trunk/scripts/build/debug/400-ltrace.sh  |    2     1     1     0 +-
 /trunk/scripts/build/debug/300-gdb.sh     |    6     3     3     0 +++---
 /trunk/scripts/build/debug/500-strace.sh  |    2     1     1     0 +-
 /trunk/scripts/build/debug/200-duma.sh    |    6     3     3     0 +++---
 /trunk/scripts/crosstool-NG.sh.in         |   16     7     9     0 +++++++---------
 /trunk/scripts/functions                  |    2     1     1     0 +-
 /trunk/config/toolchain.in                |   17    17     0     0 +++++++++++++++++
 8 files changed, 34 insertions(+), 19 deletions(-)

5 files changed, 9 insertions, 9 deletions

diff --git a/scripts/build/debug/100-dmalloc.sh b/scripts/build/debug/100-dmalloc.sh
index 2766ff8..2c5d80c 100644
--- a/scripts/build/debug/100-dmalloc.sh
+++ b/scripts/build/debug/100-dmalloc.sh
@@ -47,7 +47,7 @@ do_debug_dmalloc_build() {
 
     CT_DoLog EXTRA "Installing dmalloc"
     CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" installincs installlib
-    CT_DoExecLog ALL make DESTDIR="${CT_DEBUG_INSTALL_DIR}" installutil
+    CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" installutil
 
     CT_EndStep
 }
diff --git a/scripts/build/debug/200-duma.sh b/scripts/build/debug/200-duma.sh
index b8ef5a6..a2d6a54 100644
--- a/scripts/build/debug/200-duma.sh
+++ b/scripts/build/debug/200-duma.sh
@@ -47,12 +47,12 @@ do_debug_duma_build() {
         CT_DoLog EXTRA "Installing shared library link"
         ln -vsf ${duma_so} "${CT_SYSROOT_DIR}/usr/lib/libduma.so"   2>&1 |CT_DoLog ALL
         CT_DoLog EXTRA "Installing wrapper script"
-        mkdir -p "${CT_DEBUG_INSTALL_DIR}/usr/bin"
+        mkdir -p "${CT_DEBUGROOT_DIR}/usr/bin"
         # Install a simpler, smaller, safer wrapper than the one provided by D.U.M.A.
         sed -r -e 's:^LIBDUMA_SO=.*:LIBDUMA_SO=/usr/lib/'"${duma_so}"':;'   \
             "${CT_LIB_DIR}/scripts/build/debug/duma.in"                     \
-            >"${CT_DEBUG_INSTALL_DIR}/usr/bin/duma"
-        chmod 755 "${CT_DEBUG_INSTALL_DIR}/usr/bin/duma"
+            >"${CT_DEBUGROOT_DIR}/usr/bin/duma"
+        chmod 755 "${CT_DEBUGROOT_DIR}/usr/bin/duma"
     fi
 
     CT_Popd
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index 24d87dd..6acb567 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -215,10 +215,10 @@ do_debug_gdb_build() {
         CT_DoExecLog ALL make ${PARALLELMFLAGS} CC=${CT_TARGET}-${CT_CC}
 
         CT_DoLog EXTRA "Installing native gdb"
-        CT_DoExecLog ALL make DESTDIR="${CT_DEBUG_INSTALL_DIR}" install
+        CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" install
 
         # Building a native gdb also builds a gdbserver
-        find "${CT_DEBUG_INSTALL_DIR}" -type f -name gdbserver -exec rm -fv {} \; 2>&1 |CT_DoLog ALL
+        find "${CT_DEBUGROOT_DIR}" -type f -name gdbserver -exec rm -fv {} \; 2>&1 |CT_DoLog ALL
 
         unset ac_cv_func_strncmp_works
 
@@ -269,7 +269,7 @@ do_debug_gdb_build() {
         CT_DoExecLog ALL make ${PARALLELMFLAGS} CC=${CT_TARGET}-${CT_CC}
 
         CT_DoLog EXTRA "Installing gdbserver"
-        CT_DoExecLog ALL make DESTDIR="${CT_DEBUG_INSTALL_DIR}" install
+        CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" install
 
         CT_EndStep
     fi
diff --git a/scripts/build/debug/400-ltrace.sh b/scripts/build/debug/400-ltrace.sh
index 48cbc7b..f1e799c 100644
--- a/scripts/build/debug/400-ltrace.sh
+++ b/scripts/build/debug/400-ltrace.sh
@@ -37,7 +37,7 @@ do_debug_ltrace_build() {
     CT_DoExecLog ALL make
 
     CT_DoLog EXTRA "Installing ltrace"
-    CT_DoExecLog ALL make DESTDIR="${CT_DEBUG_INSTALL_DIR}" install
+    CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" install
 
     CT_Popd
     CT_EndStep
diff --git a/scripts/build/debug/500-strace.sh b/scripts/build/debug/500-strace.sh
index 6b1ff4d..174c8dc 100644
--- a/scripts/build/debug/500-strace.sh
+++ b/scripts/build/debug/500-strace.sh
@@ -27,7 +27,7 @@ do_debug_strace_build() {
     CT_DoExecLog ALL make
 
     CT_DoLog EXTRA "Installing strace"
-    CT_DoExecLog ALL make DESTDIR="${CT_DEBUG_INSTALL_DIR}" install
+    CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" install
 
     CT_Popd
     CT_EndStep