diff -r 21f4f28e60ec -r 822af73497bf scripts/crosstool-NG.sh.in
--- a/scripts/crosstool-NG.sh.in	Mon Dec 12 21:41:16 2011 +0200
+++ b/scripts/crosstool-NG.sh.in	Mon Jan 16 23:36:42 2012 +0100
@@ -78,11 +78,13 @@
 CT_TOOLS_OVERIDE_DIR="${CT_WORK_DIR}/tools"
 CT_DoLog DEBUG "Creating bin-override 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
+cat "${CT_LIB_DIR}/paths.sh" |while read trash line; do
     tool="${line%%=*}"
     path="${line#*=}"
     CT_DoLog DEBUG "Creating script-override for '${tool}' -> '${path}'"
-    printf "#${BANG}${CT_CONFIG_SHELL}\nexec '${path}' \"\${@}\"\n" >"${CT_TOOLS_OVERIDE_DIR}/bin/${tool}"
+    # Note: we need to supress the " in the path because
+    # there can be arguments in there (thanks autostuff...)
+    printf "#${BANG}${CT_CONFIG_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_TOOLS_OVERIDE_DIR}/bin:${PATH}"