1.1 --- a/scripts/build/companion_tools/050-make.sh Mon Dec 20 00:07:29 2010 +0100
1.2 +++ b/scripts/build/companion_tools/050-make.sh Sat Dec 18 22:55:56 2010 +0100
1.3 @@ -18,7 +18,7 @@
1.4 CT_Pushd "${CT_BUILD_DIR}/build-make"
1.5
1.6 CT_DoExecLog CFG "${CT_SRC_DIR}/make-${CT_MAKE_VERSION}/configure" \
1.7 - --prefix="${CT_TOOLS_OVERIDE_DIR}"
1.8 + --prefix="${CT_BUILDTOOLS_PREFIX_DIR}"
1.9 CT_DoExecLog ALL make
1.10 CT_DoExecLog ALL make install
1.11 CT_Popd
2.1 --- a/scripts/build/companion_tools/100-m4.sh Mon Dec 20 00:07:29 2010 +0100
2.2 +++ b/scripts/build/companion_tools/100-m4.sh Sat Dec 18 22:55:56 2010 +0100
2.3 @@ -19,7 +19,7 @@
2.4
2.5 CT_DoExecLog CFG \
2.6 "${CT_SRC_DIR}/m4-${CT_M4_VERSION}/configure" \
2.7 - --prefix="${CT_TOOLS_OVERIDE_DIR}"
2.8 + --prefix="${CT_BUILDTOOLS_PREFIX_DIR}"
2.9 CT_DoExecLog ALL make
2.10 CT_DoExecLog ALL make install
2.11 CT_Popd
3.1 --- a/scripts/build/companion_tools/200-autoconf.sh Mon Dec 20 00:07:29 2010 +0100
3.2 +++ b/scripts/build/companion_tools/200-autoconf.sh Sat Dec 18 22:55:56 2010 +0100
3.3 @@ -20,11 +20,11 @@
3.4 # Ensure configure gets run using the CONFIG_SHELL as configure seems to
3.5 # have trouble when CONFIG_SHELL is set and /bin/sh isn't bash
3.6 # For reference see:
3.7 - # http://www.gnu.org/software/autoconf/manual/autoconf.html#CONFIG_005fSHEL
3.8 + # http://www.gnu.org/software/autoconf/manual/autoconf.html#CONFIG_005fSHELL
3.9
3.10 CT_DoExecLog CFG ${CONFIG_SHELL} \
3.11 "${CT_SRC_DIR}/autoconf-${CT_AUTOCONF_VERSION}/configure" \
3.12 - --prefix="${CT_TOOLS_OVERIDE_DIR}"
3.13 + --prefix="${CT_BUILDTOOLS_PREFIX_DIR}"
3.14 CT_DoExecLog ALL make
3.15 CT_DoExecLog ALL make install
3.16 CT_Popd
4.1 --- a/scripts/build/companion_tools/300-automake.sh Mon Dec 20 00:07:29 2010 +0100
4.2 +++ b/scripts/build/companion_tools/300-automake.sh Sat Dec 18 22:55:56 2010 +0100
4.3 @@ -19,7 +19,7 @@
4.4
4.5 CT_DoExecLog CFG \
4.6 "${CT_SRC_DIR}/automake-${CT_AUTOMAKE_VERSION}/configure" \
4.7 - --prefix="${CT_TOOLS_OVERIDE_DIR}"
4.8 + --prefix="${CT_BUILDTOOLS_PREFIX_DIR}"
4.9 CT_DoExecLog ALL make
4.10 CT_DoExecLog ALL make install
4.11 CT_Popd
5.1 --- a/scripts/build/companion_tools/400-libtool.sh Mon Dec 20 00:07:29 2010 +0100
5.2 +++ b/scripts/build/companion_tools/400-libtool.sh Sat Dec 18 22:55:56 2010 +0100
5.3 @@ -19,7 +19,7 @@
5.4
5.5 CT_DoExecLog CFG \
5.6 "${CT_SRC_DIR}/libtool-${CT_LIBTOOL_VERSION}/configure" \
5.7 - --prefix="${CT_TOOLS_OVERIDE_DIR}"
5.8 + --prefix="${CT_BUILDTOOLS_PREFIX_DIR}"
5.9 CT_DoExecLog ALL make
5.10 CT_DoExecLog ALL make install
5.11 CT_Popd