1.1 --- a/scripts/build/mpfr.sh	Sat Jan 03 21:11:41 2009 +0000
     1.2 +++ b/scripts/build/mpfr.sh	Sun Jan 04 14:25:58 2009 +0000
     1.3 @@ -12,13 +12,13 @@
     1.4  
     1.5  # Download MPFR
     1.6  do_mpfr_get() {
     1.7 -    CT_GetFile "${CT_MPFR_FILE}" http://www.mpfr.org/mpfr-current/          \
     1.8 +    CT_GetFile "mpfr-${CT_MPFR_VERSION}" http://www.mpfr.org/mpfr-current/  \
     1.9                                   http://www.mpfr.org/mpfr-${CT_MPFR_VERSION}/
    1.10  }
    1.11  
    1.12  # Extract MPFR
    1.13  do_mpfr_extract() {
    1.14 -    CT_ExtractAndPatch "${CT_MPFR_FILE}"
    1.15 +    CT_ExtractAndPatch "mpfr-${CT_MPFR_VERSION}"
    1.16  
    1.17      # OK, Gentoo have a sanity check that libtool.m4 and ltmain.sh have the
    1.18      # same version number. Unfortunately, some tarballs of MPFR are not
    1.19 @@ -27,7 +27,7 @@
    1.20      # and: http://sourceware.org/ml/crossgcc/2008-06/msg00005.html
    1.21      # This hack is not bad per se, but the MPFR guys would be better not to
    1.22      # do that in the future...
    1.23 -    CT_Pushd "${CT_SRC_DIR}/${CT_MPFR_FILE}"
    1.24 +    CT_Pushd "${CT_SRC_DIR}/mpfr-${CT_MPFR_VERSION}"
    1.25      if [ ! -f .autotools.ct-ng ]; then
    1.26          CT_DoLog DEBUG "Re-building autotools files"
    1.27          CT_DoExecLog ALL autoreconf -fi
    1.28 @@ -56,14 +56,14 @@
    1.29      CT_DoStep INFO "Installing MPFR"
    1.30  
    1.31      CT_DoLog EXTRA "Configuring MPFR"
    1.32 -    CFLAGS="${CT_CFLAGS_FOR_HOST}"              \
    1.33 -    CT_DoExecLog ALL                            \
    1.34 -    "${CT_SRC_DIR}/${CT_MPFR_FILE}/configure"   \
    1.35 -        --build=${CT_BUILD}                     \
    1.36 -        --host=${CT_HOST}                       \
    1.37 -        --prefix="${CT_PREFIX_DIR}"             \
    1.38 -        --enable-thread-safe                    \
    1.39 -        --disable-shared --enable-static        \
    1.40 +    CFLAGS="${CT_CFLAGS_FOR_HOST}"                      \
    1.41 +    CT_DoExecLog ALL                                    \
    1.42 +    "${CT_SRC_DIR}/mpfr-${CT_MPFR_VERSION}/configure"   \
    1.43 +        --build=${CT_BUILD}                             \
    1.44 +        --host=${CT_HOST}                               \
    1.45 +        --prefix="${CT_PREFIX_DIR}"                     \
    1.46 +        --enable-thread-safe                            \
    1.47 +        --disable-shared --enable-static                \
    1.48          --with-gmp="${CT_PREFIX_DIR}"
    1.49  
    1.50      CT_DoLog EXTRA "Building MPFR"
    1.51 @@ -89,14 +89,14 @@
    1.52      CT_DoStep INFO "Installing MPFR for the target"
    1.53  
    1.54      CT_DoLog EXTRA "Configuring MPFR"
    1.55 -    CFLAGS="${CT_CFLAGS_FOR_TARGET}"            \
    1.56 -    CT_DoExecLog ALL                            \
    1.57 -    "${CT_SRC_DIR}/${CT_MPFR_FILE}/configure"   \
    1.58 -        --build=${CT_BUILD}                     \
    1.59 -        --host=${CT_TARGET}                     \
    1.60 -        --prefix=/usr                           \
    1.61 -        --enable-thread-safe                    \
    1.62 -        --disable-shared --enable-static        \
    1.63 +    CFLAGS="${CT_CFLAGS_FOR_TARGET}"                    \
    1.64 +    CT_DoExecLog ALL                                    \
    1.65 +    "${CT_SRC_DIR}/mpfr-${CT_MPFR_VERSION}/configure"   \
    1.66 +        --build=${CT_BUILD}                             \
    1.67 +        --host=${CT_TARGET}                             \
    1.68 +        --prefix=/usr                                   \
    1.69 +        --enable-thread-safe                            \
    1.70 +        --disable-shared --enable-static                \
    1.71          --with-gmp="${CT_SYSROOT_DIR}/usr"
    1.72  
    1.73      CT_DoLog EXTRA "Building MPFR"