Update the way we handle directories supplied by the user:

 - the tarball directory is considered as a local copy, and tarballs are copied to a working area,
 - the sources and build directories (CT_SRC_DIR and CT_BUILD_DIR) are now computed, and no longer an option,
 - the build dir has been renamed from 'build' to 'targets'.
That should ease preparing a tarball of the resulting target.

1 files changed, 5 insertions, 30 deletions

diff --git a/config/global.in b/config/global.in
index 9378bdf9..ee23a5de 100644
--- a/config/global.in
+++ b/config/global.in
@@ -70,38 +70,13 @@ config USE_PIPES
 
 comment "Paths"
 
-config TARBALLS_DIR
+config LOCAL_TARBALLS_DIR
     string
-    prompt "Tarballs directory"
-    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).
-
-config SRC_DIR
-    string
-    prompt "Extract directory"
-    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.
-      
-      If you will build multiple toolchains, you should arrange to have one
-      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 "${CT_TOP_DIR}/build/${CT_TARGET}/${CT_CC}-${CT_CC_VERSION}-${CT_LIBC}-${CT_LIBC_VERSION}/build"
+    prompt "Local tarballs directory"
+    default ""
     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.
+      If you have previously downloaded the tarballs, enter the PATH where
+      you stored them here.
 
 config PREFIX_DIR
     string