Index: texi2dvi
===================================================================
--- texi2dvi	(revision 7139)
+++ texi2dvi	(working copy)
@@ -1930,7 +1930,7 @@
 
   # An auxiliary directory used for all the auxiliary tasks involved
   # in compiling this document.
-  case $build_dir in
+  case "$build_dir" in
       '' | . ) t2ddir=$out_noext.t2d ;;
       *) # Avoid collisions between multiple occurrences of the same
          # file, so depend on the output path.  Remove leading `./',
@@ -1938,7 +1938,7 @@
          # an invisible file. The sed expression is fragile if the cwd
          # has active characters.  Transform / into ! so that we don't
          # need `mkdir -p'.  It might be something to reconsider.
-         t2ddir=$build_dir/`echo "$out_dir_abs/$out_noext.t2d" |
+         t2ddir="$build_dir"/`echo "$out_dir_abs/$out_noext.t2d" |
              $SED "s,^$orig_pwd/,,;s,^\./,,;s,/,!,g"`
   esac
   # Remove it at exit if clean mode.