i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch by [email protected] (bug #723) to support spaces

Browse Source 
in the path to the Haiku working dir.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18375 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2006-08-03 17:57:34 +00:00
parent 6c0e9c8097
commit 6e7c6fe567
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure
Vendored
+16 -16
View File
@@ -170,9 +170,9 @@ get_build_tool_path()
# get cwd and the source directory # get cwd and the source directory
currentDir=`pwd` currentDir=`pwd`
cd `dirname $0` cd `dirname "$0"`
sourceDir=`pwd` sourceDir=`pwd`
cd $currentDir cd "$currentDir"
# default parameter values # default parameter values
# #
@@ -265,15 +265,15 @@ if [ "$currentDir" = "$sourceDir" ]; then
else else
outputDir=$currentDir outputDir=$currentDir
fi fi
buildOutputDir=$outputDir/build buildOutputDir="$outputDir/build"
buildAttributesDir=$outputDir/attributes buildAttributesDir="$outputDir/attributes"
mkdir -p $buildOutputDir || exit 1 mkdir -p "$buildOutputDir" || exit 1
# build cross tools from sources # build cross tools from sources
if [ -n "$buildCrossTools" ]; then if [ -n "$buildCrossTools" ]; then
"$buildCrossToolsScript" $buildCrossToolsMachine "$sourceDir" \ "$buildCrossToolsScript" $buildCrossToolsMachine "$sourceDir" \
"$buildCrossTools" $outputDir || exit 1 "$buildCrossTools" "$outputDir" || exit 1
crossToolsPrefix=$outputDir/cross-tools/bin/${haikuGCCMachine}- crossToolsPrefix="$outputDir/cross-tools/bin/${haikuGCCMachine}-"
fi fi
# cross tools # cross tools
@@ -289,15 +289,15 @@ fi
standard_gcc_settings standard_gcc_settings
# Generate BuildConfig # Generate BuildConfig
cat << EOF > $buildOutputDir/BuildConfig cat << EOF > "$buildOutputDir/BuildConfig"
# BuildConfig # BuildConfig
# Note: This file has been automatically generated by configure. # Note: This file has been automatically generated by configure.
FLOPPY_PATH ?= "${floppy}" ; FLOPPY_PATH ?= "${floppy}" ;
BOCHS_DEBUG_HACK ?= ${bochs_debug} ; BOCHS_DEBUG_HACK ?= "${bochs_debug}" ;
INCLUDE_GPL_ADDONS ?= ${include_gpl_addons} ; INCLUDE_GPL_ADDONS ?= "${include_gpl_addons}" ;
TARGET_PLATFORM ?= ${target} ; TARGET_PLATFORM ?= "${target}" ;
HOST_PLATFORM ?= ${buildPlatform} ; HOST_PLATFORM ?= "${buildPlatform}" ;
HAIKU_GCC_RAW_VERSION ?= ${haikuGCCVersion} ; HAIKU_GCC_RAW_VERSION ?= ${haikuGCCVersion} ;
HAIKU_GCC_MACHINE ?= ${haikuGCCMachine} ; HAIKU_GCC_MACHINE ?= ${haikuGCCMachine} ;
@@ -331,7 +331,7 @@ EOF
# Libgcc.a objects # Libgcc.a objects
cat << EOF > $buildOutputDir/libgccObjects cat << EOF > "$buildOutputDir/libgccObjects"
# libgcc.a objects to be linked against libroot.so # libgcc.a objects to be linked against libroot.so
# Note: This file has been automatically generated by configure. # Note: This file has been automatically generated by configure.
@@ -343,7 +343,7 @@ EOF
timezoneSources="africa antarctica asia australasia europe northamerica timezoneSources="africa antarctica asia australasia europe northamerica
southamerica pacificnew etcetera factory backward" southamerica pacificnew etcetera factory backward"
cat << EOF > $buildOutputDir/Timezones cat << EOF > "$buildOutputDir/Timezones"
# Timezones used for the build # Timezones used for the build
# Note: This file has been automatically generated by configure. # Note: This file has been automatically generated by configure.
@@ -354,9 +354,9 @@ EOF
for source in ${timezoneSources}; do for source in ${timezoneSources}; do
f=$sourceDir/src/data/etc/timezones/$source 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 ; TZ_OBJECTS on <timezone-source>${source} ?= $TZOBJECTS ;
EOF EOF
done done