# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1292709356 -3600
# Node ID 2e0f0757289ddfdabd68b933df1d4065d89998b2
# Parent  911b3a703497c6a9ce42f194a3d85795b5c47866
comptools: install them side-to-side with build tools

As companion tools might or might not be used to build each
toolchain, they do belong to that toolchain's build tools,
not to the generic override tools.

Fix a typo in the autoconf URL.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

diff -r 911b3a703497 -r 2e0f0757289d scripts/build/companion_tools/050-make.sh
--- a/scripts/build/companion_tools/050-make.sh	Mon Dec 20 00:07:29 2010 +0100
+++ b/scripts/build/companion_tools/050-make.sh	Sat Dec 18 22:55:56 2010 +0100
@@ -18,7 +18,7 @@
     CT_Pushd "${CT_BUILD_DIR}/build-make"
 
     CT_DoExecLog CFG "${CT_SRC_DIR}/make-${CT_MAKE_VERSION}/configure" \
-                     --prefix="${CT_TOOLS_OVERIDE_DIR}"
+                     --prefix="${CT_BUILDTOOLS_PREFIX_DIR}"
     CT_DoExecLog ALL make
     CT_DoExecLog ALL make install
     CT_Popd
diff -r 911b3a703497 -r 2e0f0757289d scripts/build/companion_tools/100-m4.sh
--- a/scripts/build/companion_tools/100-m4.sh	Mon Dec 20 00:07:29 2010 +0100
+++ b/scripts/build/companion_tools/100-m4.sh	Sat Dec 18 22:55:56 2010 +0100
@@ -19,7 +19,7 @@
     
     CT_DoExecLog CFG \
     "${CT_SRC_DIR}/m4-${CT_M4_VERSION}/configure" \
-        --prefix="${CT_TOOLS_OVERIDE_DIR}"
+        --prefix="${CT_BUILDTOOLS_PREFIX_DIR}"
     CT_DoExecLog ALL make
     CT_DoExecLog ALL make install
     CT_Popd
diff -r 911b3a703497 -r 2e0f0757289d scripts/build/companion_tools/200-autoconf.sh
--- a/scripts/build/companion_tools/200-autoconf.sh	Mon Dec 20 00:07:29 2010 +0100
+++ b/scripts/build/companion_tools/200-autoconf.sh	Sat Dec 18 22:55:56 2010 +0100
@@ -20,11 +20,11 @@
     # Ensure configure gets run using the CONFIG_SHELL as configure seems to
     # have trouble when CONFIG_SHELL is set and /bin/sh isn't bash
     # For reference see:
-    # http://www.gnu.org/software/autoconf/manual/autoconf.html#CONFIG_005fSHEL
+    # http://www.gnu.org/software/autoconf/manual/autoconf.html#CONFIG_005fSHELL
     
     CT_DoExecLog CFG ${CONFIG_SHELL} \
     "${CT_SRC_DIR}/autoconf-${CT_AUTOCONF_VERSION}/configure" \
-        --prefix="${CT_TOOLS_OVERIDE_DIR}"
+        --prefix="${CT_BUILDTOOLS_PREFIX_DIR}"
     CT_DoExecLog ALL make
     CT_DoExecLog ALL make install
     CT_Popd
diff -r 911b3a703497 -r 2e0f0757289d scripts/build/companion_tools/300-automake.sh
--- a/scripts/build/companion_tools/300-automake.sh	Mon Dec 20 00:07:29 2010 +0100
+++ b/scripts/build/companion_tools/300-automake.sh	Sat Dec 18 22:55:56 2010 +0100
@@ -19,7 +19,7 @@
     
     CT_DoExecLog CFG \
     "${CT_SRC_DIR}/automake-${CT_AUTOMAKE_VERSION}/configure" \
-        --prefix="${CT_TOOLS_OVERIDE_DIR}"
+        --prefix="${CT_BUILDTOOLS_PREFIX_DIR}"
     CT_DoExecLog ALL make
     CT_DoExecLog ALL make install
     CT_Popd
diff -r 911b3a703497 -r 2e0f0757289d scripts/build/companion_tools/400-libtool.sh
--- a/scripts/build/companion_tools/400-libtool.sh	Mon Dec 20 00:07:29 2010 +0100
+++ b/scripts/build/companion_tools/400-libtool.sh	Sat Dec 18 22:55:56 2010 +0100
@@ -19,7 +19,7 @@
     
     CT_DoExecLog CFG \
     "${CT_SRC_DIR}/libtool-${CT_LIBTOOL_VERSION}/configure" \
-        --prefix="${CT_TOOLS_OVERIDE_DIR}"
+        --prefix="${CT_BUILDTOOLS_PREFIX_DIR}"
     CT_DoExecLog ALL make
     CT_DoExecLog ALL make install
     CT_Popd