1.1 --- a/tools/addToolVersion.sh	Thu Feb 14 22:34:19 2008 +0000
     1.2 +++ b/tools/addToolVersion.sh	Thu Apr 17 21:04:23 2008 +0000
     1.3 @@ -44,17 +44,17 @@
     1.4  while [ $i -le $# ]; do
     1.5      case "${!i}" in
     1.6          # Tools:
     1.7 -        --gcc)              cat=CC;        tool=gcc;      tool_prefix=cc_;      tool_suffix=;;
     1.8 -        --binutils)         cat=BINUTILS;  tool=binutils; tool_prefix=;         tool_suffix=;;
     1.9 -        --glibc)            cat=LIBC;      tool=glibc;    tool_prefix=libc_;    tool_suffix=;;
    1.10 -        --uClibc)           cat=LIBC;      tool=uClibc;   tool_prefix=libc_;    tool_suffix=;;
    1.11 -        --linux)            cat=KERNEL;    tool=linux;    tool_prefix=kernel_;  tool_suffix=;;
    1.12 -        --gdb)              cat=GDB;       tool=gdb;      tool_prefix=debug/    tool_suffix=;;
    1.13 -        --dmalloc)          cat=DMALLOC;   tool=dmalloc;  tool_prefix=debug/    tool_suffix=;;
    1.14 -        --duma)             cat=DUMA;      tool=duma;     tool_prefix=debug/    tool_suffix=;;
    1.15 -        --strace)           cat=STRACE;    tool=strace;   tool_prefix=debug/    tool_suffix=;;
    1.16 -        --ltrace)           cat=LTRACE;    tool=ltrace;   tool_prefix=debug/    tool_suffix=;;
    1.17 -        --libelf)           cat=LIBELF;    tool=libelf;   tool_prefix=tools/    tool_suffix=;;
    1.18 +        --gcc)              cat=CC;        tool=gcc;      tool_prefix=cc;      tool_suffix=;;
    1.19 +        --binutils)         cat=BINUTILS;  tool=binutils; tool_prefix=;        tool_suffix=;;
    1.20 +        --glibc)            cat=LIBC;      tool=glibc;    tool_prefix=libc;    tool_suffix=;;
    1.21 +        --uClibc)           cat=LIBC;      tool=uClibc;   tool_prefix=libc;    tool_suffix=;;
    1.22 +        --linux)            cat=KERNEL;    tool=linux;    tool_prefix=kernel;  tool_suffix=;;
    1.23 +        --gdb)              cat=GDB;       tool=gdb;      tool_prefix=debug    tool_suffix=;;
    1.24 +        --dmalloc)          cat=DMALLOC;   tool=dmalloc;  tool_prefix=debug    tool_suffix=;;
    1.25 +        --duma)             cat=DUMA;      tool=duma;     tool_prefix=debug    tool_suffix=;;
    1.26 +        --strace)           cat=STRACE;    tool=strace;   tool_prefix=debug    tool_suffix=;;
    1.27 +        --ltrace)           cat=LTRACE;    tool=ltrace;   tool_prefix=debug    tool_suffix=;;
    1.28 +        --libelf)           cat=LIBELF;    tool=libelf;   tool_prefix=tools    tool_suffix=;;
    1.29          # Tools options:
    1.30          -x|--experimental)  EXP=1; OBS=; prompt_suffix=" (EXPERIMENTAL)";;
    1.31          -o|--obsolete)      OBS=1; EXP=; prompt_suffix=" (OBSOLETE)";;
    1.32 @@ -90,13 +90,13 @@
    1.33              *,*.*.*.*)      DEP="${DEP} && KERNEL_VERSION_SEE_EXTRAVERSION";;
    1.34          esac
    1.35          L5="    default \"${ver}\" if ${cat}_${TOOL_SUFFIX}_V_${v}"
    1.36 -        FILE="config/${tool_prefix}${tool}_headers_${tool_suffix}.in"
    1.37 +        FILE="config/${tool_prefix}/${tool}_headers_${tool_suffix}.in"
    1.38      else
    1.39          L1="config ${cat}_V_${v}\n"
    1.40          L2="    bool\n"
    1.41          L3="    prompt \"${ver}${prompt_suffix}\"\n"
    1.42          L5="    default \"${ver}\" if ${cat}_V_${v}"
    1.43 -        FILE="config/${tool_prefix}${tool}.in"
    1.44 +        FILE="config/${tool_prefix}/${tool}.in"
    1.45      fi
    1.46      [ -n "${EXP}" ] && DEP="${DEP} && EXPERIMENTAL"
    1.47      [ -n "${OBS}" ] && DEP="${DEP} && OBSOLETE"