# HG changeset patch # User "Yann E. MORIN" # Date 1176221859 0 # Node ID 97e44d892c924e88ca2580f29f635e4af8392ece # Parent 58de352b959b192487952df8327fe0bc207e7bf8 Use ${CT_TOP_DIR}/build as a base for build directories (used in default values for paths). Remove this directory on distclean (hard-coded). Mark the version to be 0.0.1-svn (no release yet). diff -r 58de352b959b -r 97e44d892c92 Makefile --- a/Makefile Tue Apr 10 16:07:30 2007 +0000 +++ b/Makefile Tue Apr 10 16:17:39 2007 +0000 @@ -2,7 +2,7 @@ # Copyright 2006 Yann E. MORIN # The project version -export PROJECTVERSION=0.0.1 +export PROJECTVERSION=0.0.1-svn # This should eventually be computed if compiling out-of-tree is implemented export CT_TOP_DIR=$(shell pwd) @@ -23,7 +23,7 @@ @echo 'Build targets:' @echo '* build - Build the toolchain' @echo ' clean - Remove generated files' - @echo ' distclean - Remove generated files and configuration' + @echo ' distclean - Remove generated files, configuration and build directories' include $(CT_TOP_DIR)/tools/Makefile @@ -39,4 +39,4 @@ .PHONY: distclean distclean:: clean @rm -f .config* ..config.tmp - + @rm -rf "$(CT_TOP_DIR)/build" diff -r 58de352b959b -r 97e44d892c92 config/global.in --- a/config/global.in Tue Apr 10 16:07:30 2007 +0000 +++ b/config/global.in Tue Apr 10 16:17:39 2007 +0000 @@ -49,7 +49,7 @@ config TARBALLS_DIR string prompt "Tarballs directory" - default "`pwd`/tarballs" + default "${CT_TOP_DIR}/build/tarballs" help This is the directory into which tarballs are going to be stored once they are downloaded (or otherwise retrieved). @@ -57,7 +57,7 @@ config SRC_DIR string prompt "Extract directory" - default "`pwd`/${CT_TARGET}/src" + default "${CT_TOP_DIR}/build/${CT_TARGET}/${CT_CC}-${CT_CC_VERSION}-${CT_LIBC}-${CT_LIBC_VERSION}/src" help This is the directory into which tarballs will be extracted. @@ -65,16 +65,20 @@ SRC_DIR for each toolchain, as different targets may require different patches to be applied. + You should not need to change this from the default. + config BUILD_DIR string prompt "Build directory" - default "`pwd`/${CT_TARGET}/gcc-${CT_CC_VERSION}-${CT_LIBC}-${CT_LIBC_VERSION}" + default "${CT_TOP_DIR}/build/${CT_TARGET}/${CT_CC}-${CT_CC_VERSION}-${CT_LIBC}-${CT_LIBC_VERSION}/build" help This is the directory into which builds will occur. Once again, arrange for one build directory for each toolchain you build, to avoid collision. + You should not need to change this from the default. + config PREFIX_DIR string prompt "Prefix directory"