Moving around the files in config/ broke the tools/addToolVersion.sh script.

Fix that.

 /trunk/tools/addToolVersion.sh |   26    13    13     0 +++++++++++++-------------
 /trunk/config/kernel/linux.in  |    6     3     3     0 +++---
 /trunk/config/kernel.in        |    2     1     1     0 +-
 /trunk/config/cc.in            |    2     1     1     0 +-
 /trunk/config/libc.in          |    4     2     2     0 ++--
 5 files changed, 20 insertions(+), 20 deletions(-)

11 files changed, 20 insertions, 20 deletions

diff --git a/config/cc.in b/config/cc.in
index 2b74fbab..dd8fee8b 100644
--- a/config/cc.in
+++ b/config/cc.in
@@ -32,7 +32,7 @@ config CC
     default "gcc" if CC_GCC
 
 if CC_GCC
-source config/cc/cc_gcc.in
+source config/cc/gcc.in
 endif
 
 config CC_SUPPORT_CXX
diff --git a/config/cc/cc_gcc.in b/config/cc/gcc.in
index 9df1dfc6..9df1dfc6 100644
--- a/config/cc/cc_gcc.in
+++ b/config/cc/gcc.in
diff --git a/config/kernel.in b/config/kernel.in
index 28107765..44eebe7c 100644
--- a/config/kernel.in
+++ b/config/kernel.in
@@ -19,7 +19,7 @@ config KERNEL_VERSION
     string
 
 if KERNEL_LINUX
-source config/kernel/kernel_linux.in
+source config/kernel/linux.in
 endif
 
 endmenu
diff --git a/config/kernel/kernel_linux.in b/config/kernel/linux.in
index cb5348ea..405bc376 100644
--- a/config/kernel/kernel_linux.in
+++ b/config/kernel/linux.in
@@ -61,15 +61,15 @@ config KERNEL_VERSION_SEE_EXTRAVERSION
       that an extra version fixes a headers bug.
 
 if KERNEL_LINUX_HEADERS_INSTALL
-source config/kernel/kernel_linux_headers_install.in
+source config/kernel/linux_headers_install.in
 endif
 
 if KERNEL_LINUX_HEADERS_COPY
-source config/kernel/kernel_linux_headers_copy.in
+source config/kernel/linux_headers_copy.in
 endif
 
 if KERNEL_LINUX_HEADERS_SANITISED
-source config/kernel/kernel_linux_headers_sanitised.in
+source config/kernel/linux_headers_sanitised.in
 endif
 
 config KERNEL_LINUX_HEADERS_CUSTOM_DIR
diff --git a/config/kernel/kernel_linux_headers_copy.in b/config/kernel/linux_headers_copy.in
index 54eb700f..54eb700f 100644
--- a/config/kernel/kernel_linux_headers_copy.in
+++ b/config/kernel/linux_headers_copy.in
diff --git a/config/kernel/kernel_linux_headers_install.in b/config/kernel/linux_headers_install.in
index 60b471dd..60b471dd 100644
--- a/config/kernel/kernel_linux_headers_install.in
+++ b/config/kernel/linux_headers_install.in
diff --git a/config/kernel/kernel_linux_headers_sanitised.in b/config/kernel/linux_headers_sanitised.in
index 820df6ed..820df6ed 100644
--- a/config/kernel/kernel_linux_headers_sanitised.in
+++ b/config/kernel/linux_headers_sanitised.in
diff --git a/config/libc.in b/config/libc.in
index 848a89ce..e5d62eed 100644
--- a/config/libc.in
+++ b/config/libc.in
@@ -37,11 +37,11 @@ config LIBC_SUPPORT_LINUXTHREADS
     default n
 
 if LIBC_GLIBC
-source config/libc/libc_glibc.in
+source config/libc/glibc.in
 endif
 
 if LIBC_UCLIBC
-source config/libc/libc_uClibc.in
+source config/libc/uClibc.in
 endif
 
 endmenu
diff --git a/config/libc/libc_glibc.in b/config/libc/glibc.in
index e4359b71..e4359b71 100644
--- a/config/libc/libc_glibc.in
+++ b/config/libc/glibc.in
diff --git a/config/libc/libc_uClibc.in b/config/libc/uClibc.in
index 4f9943dc..4f9943dc 100644
--- a/config/libc/libc_uClibc.in
+++ b/config/libc/uClibc.in
diff --git a/tools/addToolVersion.sh b/tools/addToolVersion.sh
index acb00dd2..256894f9 100755
--- a/tools/addToolVersion.sh
+++ b/tools/addToolVersion.sh
@@ -44,17 +44,17 @@ i=1
 while [ $i -le $# ]; do
     case "${!i}" in
         # Tools:
-        --gcc)              cat=CC;        tool=gcc;      tool_prefix=cc_;      tool_suffix=;;
-        --binutils)         cat=BINUTILS;  tool=binutils; tool_prefix=;         tool_suffix=;;
-        --glibc)            cat=LIBC;      tool=glibc;    tool_prefix=libc_;    tool_suffix=;;
-        --uClibc)           cat=LIBC;      tool=uClibc;   tool_prefix=libc_;    tool_suffix=;;
-        --linux)            cat=KERNEL;    tool=linux;    tool_prefix=kernel_;  tool_suffix=;;
-        --gdb)              cat=GDB;       tool=gdb;      tool_prefix=debug/    tool_suffix=;;
-        --dmalloc)          cat=DMALLOC;   tool=dmalloc;  tool_prefix=debug/    tool_suffix=;;
-        --duma)             cat=DUMA;      tool=duma;     tool_prefix=debug/    tool_suffix=;;
-        --strace)           cat=STRACE;    tool=strace;   tool_prefix=debug/    tool_suffix=;;
-        --ltrace)           cat=LTRACE;    tool=ltrace;   tool_prefix=debug/    tool_suffix=;;
-        --libelf)           cat=LIBELF;    tool=libelf;   tool_prefix=tools/    tool_suffix=;;
+        --gcc)              cat=CC;        tool=gcc;      tool_prefix=cc;      tool_suffix=;;
+        --binutils)         cat=BINUTILS;  tool=binutils; tool_prefix=;        tool_suffix=;;
+        --glibc)            cat=LIBC;      tool=glibc;    tool_prefix=libc;    tool_suffix=;;
+        --uClibc)           cat=LIBC;      tool=uClibc;   tool_prefix=libc;    tool_suffix=;;
+        --linux)            cat=KERNEL;    tool=linux;    tool_prefix=kernel;  tool_suffix=;;
+        --gdb)              cat=GDB;       tool=gdb;      tool_prefix=debug    tool_suffix=;;
+        --dmalloc)          cat=DMALLOC;   tool=dmalloc;  tool_prefix=debug    tool_suffix=;;
+        --duma)             cat=DUMA;      tool=duma;     tool_prefix=debug    tool_suffix=;;
+        --strace)           cat=STRACE;    tool=strace;   tool_prefix=debug    tool_suffix=;;
+        --ltrace)           cat=LTRACE;    tool=ltrace;   tool_prefix=debug    tool_suffix=;;
+        --libelf)           cat=LIBELF;    tool=libelf;   tool_prefix=tools    tool_suffix=;;
         # Tools options:
         -x|--experimental)  EXP=1; OBS=; prompt_suffix=" (EXPERIMENTAL)";;
         -o|--obsolete)      OBS=1; EXP=; prompt_suffix=" (OBSOLETE)";;
@@ -90,13 +90,13 @@ for ver in ${VERSION}; do
             *,*.*.*.*)      DEP="${DEP} && KERNEL_VERSION_SEE_EXTRAVERSION";;
         esac
         L5="    default \"${ver}\" if ${cat}_${TOOL_SUFFIX}_V_${v}"
-        FILE="config/${tool_prefix}${tool}_headers_${tool_suffix}.in"
+        FILE="config/${tool_prefix}/${tool}_headers_${tool_suffix}.in"
     else
         L1="config ${cat}_V_${v}\n"
         L2="    bool\n"
         L3="    prompt \"${ver}${prompt_suffix}\"\n"
         L5="    default \"${ver}\" if ${cat}_V_${v}"
-        FILE="config/${tool_prefix}${tool}.in"
+        FILE="config/${tool_prefix}/${tool}.in"
     fi
     [ -n "${EXP}" ] && DEP="${DEP} && EXPERIMENTAL"
     [ -n "${OBS}" ] && DEP="${DEP} && OBSOLETE"