From 67e02293317ad066806ee14c2435ea421c79ca12 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Tue, 10 Apr 2007 16:17:39 +0000
Subject: 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 --git a/Makefile b/Makefile
index 9950f6a..6b2aeb1 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # Copyright 2006 Yann E. MORIN <yann.morin.1998@anciens.enib.fr>
 
 # 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 @@ help::
 	@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 @@ _ct_build: .config
 .PHONY: distclean
 distclean:: clean
 	@rm -f .config* ..config.tmp
-
+	@rm -rf "$(CT_TOP_DIR)/build"
diff --git a/config/global.in b/config/global.in
index 2f4941e..767ce3a 100644
--- a/config/global.in
+++ b/config/global.in
@@ -49,7 +49,7 @@ comment "Paths"
 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 TARBALLS_DIR
 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 @@ config SRC_DIR
       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"
-- 
cgit v0.10.2-6-g49f6