diff -r 5158aa602e58 -r a559d9890c02 config/toolchain.in
--- a/config/toolchain.in	Wed Dec 22 00:34:56 2010 +0100
+++ b/config/toolchain.in	Tue Jan 25 20:31:16 2011 +0100
@@ -8,10 +8,23 @@
     default y
     help
       Use the 'shinny new' sysroot feature of gcc: libraries split between
-      prefix/target/sys-root/lib and prefix/target/sys-root/usr/lib
+      prefix/target/sysroot/lib and prefix/target/sysroot/usr/lib
       
       You definitely want to say 'Y' here. Yes you do. I know you do. Say 'Y'.
 
+config SYSROOT_NAME
+    string
+    prompt "sysroot directory name"
+    depends on USE_SYSROOT
+    default "sysroot"
+    help
+      Enter the base name of the sysroot directory. Usually, this simply
+      is 'sysroot' (the default) or 'sys-root'.
+      
+      You are free to enter anything here, except for spaces, and '/'
+      (see SYSROOT_DIR_PREFIX, below). If you leave this empy, then the
+      default 'sysroot' is used.
+
 config SYSROOT_DIR_PREFIX
     string
     prompt "sysroot prefix dir (READ HELP)" if ! BACKEND
@@ -26,7 +39,7 @@
       to the sysroot path, just before the actual sysroot directory.
       
       In fact, the sysroot path is constructed as:
-        ${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/sys-root
+        ${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/${CT_SYSROOT_NAME}
 
 config STATIC_TOOLCHAIN
     bool