diff --git a/config/functions b/config/functions
index 5f5b8339a1..2fe22d986d 100644
--- a/config/functions
+++ b/config/functions
@@ -117,39 +117,39 @@ add_group() {
 do_autoreconf() {
   export ACLOCAL_DIR=$SYSROOT_PREFIX/usr/share/aclocal
 
-  if [ -e $ROOT/$TOOLCHAIN/bin/autoconf ]; then
+  if [ -e "$ROOT/$TOOLCHAIN/bin/autoconf" ]; then
     export AUTOCONF=$ROOT/$TOOLCHAIN/bin/autoconf
   fi
 
-  if [ -e $ROOT/$TOOLCHAIN/bin/automake ]; then
+  if [ -e "$ROOT/$TOOLCHAIN/bin/automake" ]; then
     export AUTOMAKE=$ROOT/$TOOLCHAIN/bin/automake
   fi
 
-  if [ -e $ROOT/$TOOLCHAIN/bin/autopoint ]; then
+  if [ -e "$ROOT/$TOOLCHAIN/bin/autopoint" ]; then
     export AUTOPOINT=$ROOT/$TOOLCHAIN/bin/autopoint
   fi
 
-  if [ -e $ROOT/$TOOLCHAIN/bin/libtoolize ]; then
+  if [ -e "$ROOT/$TOOLCHAIN/bin/libtoolize" ]; then
     export LIBTOOLIZE=$ROOT/$TOOLCHAIN/bin/libtoolize
   fi
 
-  if [ -e $ROOT/$TOOLCHAIN/bin/intltoolize ]; then
+  if [ -e "$ROOT/$TOOLCHAIN/bin/intltoolize" ]; then
     export INTLTOOLIZE=$ROOT/$TOOLCHAIN/bin/intltoolize
   fi
 
-  if [ -e $ROOT/$TOOLCHAIN/bin/aclocal ]; then
+  if [ -e "$ROOT/$TOOLCHAIN/bin/aclocal" ]; then
     export ACLOCAL="$ROOT/$TOOLCHAIN/bin/aclocal -I $ACLOCAL_DIR"
   fi
 
-  if [ -e $ROOT/$TOOLCHAIN/bin/autoheader ]; then
+  if [ -e "$ROOT/$TOOLCHAIN/bin/autoheader" ]; then
     export AUTOHEADER=$ROOT/$TOOLCHAIN/bin/autoheader
   fi
 
-  if [ -e $ROOT/$TOOLCHAIN/bin/libtool ]; then
+  if [ -e "$ROOT/$TOOLCHAIN/bin/libtool" ]; then
     export LIBTOOL=$ROOT/$TOOLCHAIN/bin/libtool
   fi
 
-  if [ -e $ROOT/$TOOLCHAIN/bin/autoreconf -a -e $INTLTOOLIZE ]; then
+  if [ -e "$ROOT/$TOOLCHAIN/bin/autoreconf" -a -e "$INTLTOOLIZE" ]; then
     mkdir -p $ACLOCAL_DIR
     export AUTORECONF="$ROOT/$TOOLCHAIN/bin/autoreconf --verbose --force --install -I $ACLOCAL_DIR"
     $AUTORECONF $@