Get rid of CT_GMP_FILE and CT_MPFR_FILE.

 /trunk/scripts/build/gmp.sh  |   32    16    16     0 ++++++++++++++++----------------
 /trunk/scripts/build/mpfr.sh |   38    19    19     0 +++++++++++++++++++-------------------
 /trunk/scripts/crosstool.sh  |    2     0     2     0 --
 3 files changed, 35 insertions(+), 37 deletions(-)

3 files changed, 35 insertions, 37 deletions

diff --git a/scripts/build/gmp.sh b/scripts/build/gmp.sh
index 9eae882..ab40374 100644
--- a/scripts/build/gmp.sh
+++ b/scripts/build/gmp.sh
@@ -12,12 +12,12 @@ if [ "${CT_GMP_MPFR}" = "y" ]; then
 
 # Download GMP
 do_gmp_get() {
-    CT_GetFile "${CT_GMP_FILE}" {ftp,http}://{ftp.sunet.se/pub,ftp.gnu.org}/gnu/gmp
+    CT_GetFile "gmp-${CT_GMP_VERSION}" {ftp,http}://{ftp.sunet.se/pub,ftp.gnu.org}/gnu/gmp
 }
 
 # Extract GMP
 do_gmp_extract() {
-    CT_ExtractAndPatch "${CT_GMP_FILE}"
+    CT_ExtractAndPatch "gmp-${CT_GMP_VERSION}"
 }
 
 do_gmp() {
@@ -27,13 +27,13 @@ do_gmp() {
     CT_DoStep INFO "Installing GMP"
 
     CT_DoLog EXTRA "Configuring GMP"
-    CFLAGS="${CT_CFLAGS_FOR_HOST}"              \
-    CT_DoExecLog ALL                            \
-    "${CT_SRC_DIR}/${CT_GMP_FILE}/configure"    \
-        --build=${CT_BUILD}                     \
-        --host=${CT_HOST}                       \
-        --prefix="${CT_PREFIX_DIR}"             \
-        --disable-shared --enable-static        \
+    CFLAGS="${CT_CFLAGS_FOR_HOST}"                  \
+    CT_DoExecLog ALL                                \
+    "${CT_SRC_DIR}/gmp-${CT_GMP_VERSION}/configure" \
+        --build=${CT_BUILD}                         \
+        --host=${CT_HOST}                           \
+        --prefix="${CT_PREFIX_DIR}"                 \
+        --disable-shared --enable-static            \
         --enable-fft --enable-mpbsd
 
     CT_DoLog EXTRA "Building GMP"
@@ -59,13 +59,13 @@ do_gmp_target() {
     CT_DoStep INFO "Installing GMP for the target"
 
     CT_DoLog EXTRA "Configuring GMP"
-    CFLAGS="${CT_CFLAGS_FOR_TARGET}"            \
-    CT_DoExecLog ALL                            \
-    "${CT_SRC_DIR}/${CT_GMP_FILE}/configure"    \
-        --build=${CT_BUILD}                     \
-        --host=${CT_TARGET}                     \
-        --prefix=/usr                           \
-        --disable-shared --enable-static        \
+    CFLAGS="${CT_CFLAGS_FOR_TARGET}"                \
+    CT_DoExecLog ALL                                \
+    "${CT_SRC_DIR}/gmp-${CT_GMP_VERSION}/configure" \
+        --build=${CT_BUILD}                         \
+        --host=${CT_TARGET}                         \
+        --prefix=/usr                               \
+        --disable-shared --enable-static            \
         --enable-fft --enable-mpbsd
 
     CT_DoLog EXTRA "Building GMP"
diff --git a/scripts/build/mpfr.sh b/scripts/build/mpfr.sh
index 0d865f8..c39cfa3 100644
--- a/scripts/build/mpfr.sh
+++ b/scripts/build/mpfr.sh
@@ -12,13 +12,13 @@ if [ "${CT_GMP_MPFR}" = "y" ]; then
 
 # Download MPFR
 do_mpfr_get() {
-    CT_GetFile "${CT_MPFR_FILE}" http://www.mpfr.org/mpfr-current/          \
+    CT_GetFile "mpfr-${CT_MPFR_VERSION}" http://www.mpfr.org/mpfr-current/  \
                                  http://www.mpfr.org/mpfr-${CT_MPFR_VERSION}/
 }
 
 # Extract MPFR
 do_mpfr_extract() {
-    CT_ExtractAndPatch "${CT_MPFR_FILE}"
+    CT_ExtractAndPatch "mpfr-${CT_MPFR_VERSION}"
 
     # OK, Gentoo have a sanity check that libtool.m4 and ltmain.sh have the
     # same version number. Unfortunately, some tarballs of MPFR are not
@@ -27,7 +27,7 @@ do_mpfr_extract() {
     # and: http://sourceware.org/ml/crossgcc/2008-06/msg00005.html
     # This hack is not bad per se, but the MPFR guys would be better not to
     # do that in the future...
-    CT_Pushd "${CT_SRC_DIR}/${CT_MPFR_FILE}"
+    CT_Pushd "${CT_SRC_DIR}/mpfr-${CT_MPFR_VERSION}"
     if [ ! -f .autotools.ct-ng ]; then
         CT_DoLog DEBUG "Re-building autotools files"
         CT_DoExecLog ALL autoreconf -fi
@@ -56,14 +56,14 @@ do_mpfr() {
     CT_DoStep INFO "Installing MPFR"
 
     CT_DoLog EXTRA "Configuring MPFR"
-    CFLAGS="${CT_CFLAGS_FOR_HOST}"              \
-    CT_DoExecLog ALL                            \
-    "${CT_SRC_DIR}/${CT_MPFR_FILE}/configure"   \
-        --build=${CT_BUILD}                     \
-        --host=${CT_HOST}                       \
-        --prefix="${CT_PREFIX_DIR}"             \
-        --enable-thread-safe                    \
-        --disable-shared --enable-static        \
+    CFLAGS="${CT_CFLAGS_FOR_HOST}"                      \
+    CT_DoExecLog ALL                                    \
+    "${CT_SRC_DIR}/mpfr-${CT_MPFR_VERSION}/configure"   \
+        --build=${CT_BUILD}                             \
+        --host=${CT_HOST}                               \
+        --prefix="${CT_PREFIX_DIR}"                     \
+        --enable-thread-safe                            \
+        --disable-shared --enable-static                \
         --with-gmp="${CT_PREFIX_DIR}"
 
     CT_DoLog EXTRA "Building MPFR"
@@ -89,14 +89,14 @@ do_mpfr_target() {
     CT_DoStep INFO "Installing MPFR for the target"
 
     CT_DoLog EXTRA "Configuring MPFR"
-    CFLAGS="${CT_CFLAGS_FOR_TARGET}"            \
-    CT_DoExecLog ALL                            \
-    "${CT_SRC_DIR}/${CT_MPFR_FILE}/configure"   \
-        --build=${CT_BUILD}                     \
-        --host=${CT_TARGET}                     \
-        --prefix=/usr                           \
-        --enable-thread-safe                    \
-        --disable-shared --enable-static        \
+    CFLAGS="${CT_CFLAGS_FOR_TARGET}"                    \
+    CT_DoExecLog ALL                                    \
+    "${CT_SRC_DIR}/mpfr-${CT_MPFR_VERSION}/configure"   \
+        --build=${CT_BUILD}                             \
+        --host=${CT_TARGET}                             \
+        --prefix=/usr                                   \
+        --enable-thread-safe                            \
+        --disable-shared --enable-static                \
         --with-gmp="${CT_SYSROOT_DIR}/usr"
 
     CT_DoLog EXTRA "Building MPFR"
diff --git a/scripts/crosstool.sh b/scripts/crosstool.sh
index b4ecba8..3945493 100755
--- a/scripts/crosstool.sh
+++ b/scripts/crosstool.sh
@@ -85,8 +85,6 @@ CT_CC_CORE_EXTRA_CONFIG="${CT_ARCH_CC_CORE_EXTRA_CONFIG} ${CT_CC_CORE_EXTRA_CONF
 CT_CC_EXTRA_CONFIG="${CT_ARCH_CC_EXTRA_CONFIG} ${CT_CC_EXTRA_CONFIG}"
 
 # Now, build up the variables from the user-configured options.
-CT_GMP_FILE="gmp-${CT_GMP_VERSION}"
-CT_MPFR_FILE="mpfr-${CT_MPFR_VERSION}"
 CT_CC_FILE="${CT_CC}-${CT_CC_VERSION}"
 CT_LIBC_FILE="${CT_LIBC}-${CT_LIBC_VERSION}"