Ticket #723: configure.patch
File configure.patch, 2.6 KB (added by , 18 years ago) |
---|
-
configure
170 170 171 171 # get cwd and the source directory 172 172 currentDir=`pwd` 173 cd `dirname $0`173 cd `dirname "$0"` 174 174 sourceDir=`pwd` 175 cd $currentDir175 cd "$currentDir" 176 176 177 177 # default parameter values 178 178 # … … 265 265 else 266 266 outputDir=$currentDir 267 267 fi 268 buildOutputDir= $outputDir/build269 buildAttributesDir= $outputDir/attributes270 mkdir -p $buildOutputDir|| exit 1268 buildOutputDir="$outputDir/build" 269 buildAttributesDir="$outputDir/attributes" 270 mkdir -p "$buildOutputDir" || exit 1 271 271 272 272 # build cross tools from sources 273 273 if [ -n "$buildCrossTools" ]; then 274 274 "$buildCrossToolsScript" $buildCrossToolsMachine "$sourceDir" \ 275 "$buildCrossTools" $outputDir|| exit 1276 crossToolsPrefix= $outputDir/cross-tools/bin/${haikuGCCMachine}-275 "$buildCrossTools" "$outputDir" || exit 1 276 crossToolsPrefix="$outputDir/cross-tools/bin/${haikuGCCMachine}-" 277 277 fi 278 278 279 279 # cross tools … … 289 289 standard_gcc_settings 290 290 291 291 # Generate BuildConfig 292 cat << EOF > $buildOutputDir/BuildConfig292 cat << EOF > "$buildOutputDir/BuildConfig" 293 293 # BuildConfig 294 294 # Note: This file has been automatically generated by configure. 295 295 296 296 FLOPPY_PATH ?= "${floppy}" ; 297 BOCHS_DEBUG_HACK ?= ${bochs_debug};298 INCLUDE_GPL_ADDONS ?= ${include_gpl_addons};299 TARGET_PLATFORM ?= ${target};300 HOST_PLATFORM ?= ${buildPlatform};297 BOCHS_DEBUG_HACK ?= "${bochs_debug}" ; 298 INCLUDE_GPL_ADDONS ?= "${include_gpl_addons}" ; 299 TARGET_PLATFORM ?= "${target}" ; 300 HOST_PLATFORM ?= "${buildPlatform}" ; 301 301 302 302 HAIKU_GCC_RAW_VERSION ?= ${haikuGCCVersion} ; 303 303 HAIKU_GCC_MACHINE ?= ${haikuGCCMachine} ; … … 331 331 332 332 # Libgcc.a objects 333 333 334 cat << EOF > $buildOutputDir/libgccObjects334 cat << EOF > "$buildOutputDir/libgccObjects" 335 335 # libgcc.a objects to be linked against libroot.so 336 336 # Note: This file has been automatically generated by configure. 337 337 … … 343 343 timezoneSources="africa antarctica asia australasia europe northamerica 344 344 southamerica pacificnew etcetera factory backward" 345 345 346 cat << EOF > $buildOutputDir/Timezones346 cat << EOF > "$buildOutputDir/Timezones" 347 347 # Timezones used for the build 348 348 # Note: This file has been automatically generated by configure. 349 349 … … 354 354 for source in ${timezoneSources}; do 355 355 f=$sourceDir/src/data/etc/timezones/$source 356 356 357 TZOBJECTS=`gawk '/^Zone/ { print $2 } /^Link/ { print $3 } ' $f`357 TZOBJECTS=`gawk '/^Zone/ { print $2 } /^Link/ { print $3 } ' "$f" ` 358 358 359 cat << EOF >> $buildOutputDir/Timezones359 cat << EOF >> "$buildOutputDir/Timezones" 360 360 TZ_OBJECTS on <timezone-source>${source} ?= $TZOBJECTS ; 361 361 EOF 362 362 done