From 6e7c6fe56791c5c9874e30637f28bc68594af4b4 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Thu, 3 Aug 2006 17:57:34 +0000
Subject: [PATCH] Applied patch by mathewblack@ntlworld.com (bug #723) to
 support spaces in the path to the Haiku working dir.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18375 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 configure | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/configure b/configure
index 83ecc4bbee..24440a4e5f 100755
--- a/configure
+++ b/configure
@@ -170,9 +170,9 @@ get_build_tool_path()
 
 # get cwd and the source directory
 currentDir=`pwd`
-cd `dirname $0`
+cd `dirname "$0"`
 sourceDir=`pwd`
-cd $currentDir
+cd "$currentDir"
 
 # default parameter values
 #
@@ -265,15 +265,15 @@ if [ "$currentDir" = "$sourceDir" ]; then
 else
 	outputDir=$currentDir
 fi
-buildOutputDir=$outputDir/build
-buildAttributesDir=$outputDir/attributes
-mkdir -p $buildOutputDir || exit 1
+buildOutputDir="$outputDir/build"
+buildAttributesDir="$outputDir/attributes"
+mkdir -p "$buildOutputDir" || exit 1
 
 # build cross tools from sources
 if [ -n "$buildCrossTools" ]; then
 	"$buildCrossToolsScript" $buildCrossToolsMachine "$sourceDir" \
-		"$buildCrossTools" $outputDir || exit 1
-	crossToolsPrefix=$outputDir/cross-tools/bin/${haikuGCCMachine}-
+		"$buildCrossTools" "$outputDir" || exit 1
+	crossToolsPrefix="$outputDir/cross-tools/bin/${haikuGCCMachine}-"
 fi
 
 # cross tools
@@ -289,15 +289,15 @@ fi
 standard_gcc_settings
 
 # Generate BuildConfig
-cat << EOF > $buildOutputDir/BuildConfig
+cat << EOF > "$buildOutputDir/BuildConfig"
 # BuildConfig
 # Note: This file has been automatically generated by configure.
 
 FLOPPY_PATH			?= "${floppy}" ;
-BOCHS_DEBUG_HACK	?= ${bochs_debug} ;
-INCLUDE_GPL_ADDONS	?= ${include_gpl_addons} ;
-TARGET_PLATFORM 	?= ${target} ;
-HOST_PLATFORM		?= ${buildPlatform} ;
+BOCHS_DEBUG_HACK	?= "${bochs_debug}" ;
+INCLUDE_GPL_ADDONS	?= "${include_gpl_addons}" ;
+TARGET_PLATFORM 	?= "${target}" ;
+HOST_PLATFORM		?= "${buildPlatform}" ;
 
 HAIKU_GCC_RAW_VERSION	?= ${haikuGCCVersion} ;
 HAIKU_GCC_MACHINE		?= ${haikuGCCMachine} ;
@@ -331,7 +331,7 @@ EOF
 
 # Libgcc.a objects
 
-cat << EOF > $buildOutputDir/libgccObjects
+cat << EOF > "$buildOutputDir/libgccObjects"
 # libgcc.a objects to be linked against libroot.so
 # Note: This file has been automatically generated by configure.
 
@@ -343,7 +343,7 @@ EOF
 timezoneSources="africa antarctica asia australasia europe northamerica
 	southamerica pacificnew etcetera factory backward"
 
-cat << EOF > $buildOutputDir/Timezones
+cat << EOF > "$buildOutputDir/Timezones"
 # Timezones used for the build
 # Note: This file has been automatically generated by configure.
 
@@ -354,9 +354,9 @@ EOF
 for source in ${timezoneSources}; do
 	f=$sourceDir/src/data/etc/timezones/$source
 
-TZOBJECTS=`gawk '/^Zone/ { print $2 } /^Link/ { print $3 } ' $f `
+TZOBJECTS=`gawk '/^Zone/ { print $2 } /^Link/ { print $3 } ' "$f" `
 
-cat << EOF >> $buildOutputDir/Timezones
+cat << EOF >> "$buildOutputDir/Timezones"
 TZ_OBJECTS on <timezone-source>${source} ?= $TZOBJECTS ;
 EOF
 done