diff options
| author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-12-18 22:55:56 +0100 |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-12-18 22:55:56 +0100 |
| commit | 3f0d43382c23c983c8f14f6696f270ce52a975c5 (patch) | |
| tree | eddf789f4bb4089b51f38564cd6c3a881f28ce10 | |
| parent | 742a6f650898901a648ba785317192c2ff81cda9 (diff) | |
| download | crosstool-ng-3f0d43382c23c983c8f14f6696f270ce52a975c5.tar.gz crosstool-ng-3f0d43382c23c983c8f14f6696f270ce52a975c5.tar.bz2 crosstool-ng-3f0d43382c23c983c8f14f6696f270ce52a975c5.zip | |
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>
| -rw-r--r-- | scripts/build/companion_tools/050-make.sh | 2 | ||||
| -rw-r--r-- | scripts/build/companion_tools/100-m4.sh | 2 | ||||
| -rw-r--r-- | scripts/build/companion_tools/200-autoconf.sh | 4 | ||||
| -rw-r--r-- | scripts/build/companion_tools/300-automake.sh | 2 | ||||
| -rw-r--r-- | scripts/build/companion_tools/400-libtool.sh | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/scripts/build/companion_tools/050-make.sh b/scripts/build/companion_tools/050-make.sh index fd9c288b..2a074351 100644 --- a/scripts/build/companion_tools/050-make.sh +++ b/scripts/build/companion_tools/050-make.sh @@ -18,7 +18,7 @@ do_companion_tools_make_build() { 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 --git a/scripts/build/companion_tools/100-m4.sh b/scripts/build/companion_tools/100-m4.sh index 04380a77..ff4e19f9 100644 --- a/scripts/build/companion_tools/100-m4.sh +++ b/scripts/build/companion_tools/100-m4.sh @@ -19,7 +19,7 @@ do_companion_tools_m4_build() { 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 --git a/scripts/build/companion_tools/200-autoconf.sh b/scripts/build/companion_tools/200-autoconf.sh index d90a3231..cd55a4fa 100644 --- a/scripts/build/companion_tools/200-autoconf.sh +++ b/scripts/build/companion_tools/200-autoconf.sh @@ -20,11 +20,11 @@ do_companion_tools_autoconf_build() { # 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 --git a/scripts/build/companion_tools/300-automake.sh b/scripts/build/companion_tools/300-automake.sh index e66f6ece..432db39d 100644 --- a/scripts/build/companion_tools/300-automake.sh +++ b/scripts/build/companion_tools/300-automake.sh @@ -19,7 +19,7 @@ do_companion_tools_automake_build() { 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 --git a/scripts/build/companion_tools/400-libtool.sh b/scripts/build/companion_tools/400-libtool.sh index 6970a0f2..933b00a0 100644 --- a/scripts/build/companion_tools/400-libtool.sh +++ b/scripts/build/companion_tools/400-libtool.sh @@ -19,7 +19,7 @@ do_companion_tools_libtool_build() { 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 |