diff options
Diffstat (limited to 'scripts/build/companion_tools')
-rw-r--r-- | scripts/build/companion_tools/050-make.sh | 10 | ||||
-rw-r--r-- | scripts/build/companion_tools/100-m4.sh | 6 | ||||
-rw-r--r-- | scripts/build/companion_tools/200-autoconf.sh | 6 | ||||
-rw-r--r-- | scripts/build/companion_tools/300-automake.sh | 6 | ||||
-rw-r--r-- | scripts/build/companion_tools/400-libtool.sh | 6 |
5 files changed, 12 insertions, 22 deletions
diff --git a/scripts/build/companion_tools/050-make.sh b/scripts/build/companion_tools/050-make.sh index 3d6da7c..9458a25 100644 --- a/scripts/build/companion_tools/050-make.sh +++ b/scripts/build/companion_tools/050-make.sh @@ -1,7 +1,5 @@ # Build script for make -CT_MAKE_VERSION=3.81 - do_companion_tools_make_get() { CT_GetFile "make-${CT_MAKE_VERSION}" \ {http,ftp,https}://ftp.gnu.org/gnu/make @@ -20,10 +18,10 @@ do_companion_tools_make_build() { CT_DoExecLog CFG "${CT_SRC_DIR}/make-${CT_MAKE_VERSION}/configure" \ --prefix="${CT_BUILDTOOLS_PREFIX_DIR}" - CT_DoExecLog ALL ${make} - CT_DoExecLog ALL ${make} install - if [ "${CT_COMP_TOOLS_make_gmake}" = "y" ]; then - CT_DoExecLog ALL ln -sv ${make} "${CT_BUILDTOOLS_PREFIX_DIR}/bin/gmake" + CT_DoExecLog ALL make + CT_DoExecLog ALL make install + if [ "${CT_MAKE_GMAKE_SYMLINK}" = "y" ]; then + CT_DoExecLog ALL ln -sv make "${CT_BUILDTOOLS_PREFIX_DIR}/bin/gmake" fi CT_Popd CT_EndStep diff --git a/scripts/build/companion_tools/100-m4.sh b/scripts/build/companion_tools/100-m4.sh index 35721d5..83ab815 100644 --- a/scripts/build/companion_tools/100-m4.sh +++ b/scripts/build/companion_tools/100-m4.sh @@ -1,7 +1,5 @@ # Build script for m4 -CT_M4_VERSION=1.4.13 - do_companion_tools_m4_get() { CT_GetFile "m4-${CT_M4_VERSION}" \ {http,ftp,https}://ftp.gnu.org/gnu/m4 @@ -20,8 +18,8 @@ do_companion_tools_m4_build() { CT_DoExecLog CFG \ "${CT_SRC_DIR}/m4-${CT_M4_VERSION}/configure" \ --prefix="${CT_BUILDTOOLS_PREFIX_DIR}" - CT_DoExecLog ALL ${make} - CT_DoExecLog ALL ${make} install + CT_DoExecLog ALL make + CT_DoExecLog ALL make install CT_Popd CT_EndStep } diff --git a/scripts/build/companion_tools/200-autoconf.sh b/scripts/build/companion_tools/200-autoconf.sh index def6ddc..e6e5764 100644 --- a/scripts/build/companion_tools/200-autoconf.sh +++ b/scripts/build/companion_tools/200-autoconf.sh @@ -1,7 +1,5 @@ # Build script for autoconf -CT_AUTOCONF_VERSION=2.65 - do_companion_tools_autoconf_get() { CT_GetFile "autoconf-${CT_AUTOCONF_VERSION}" \ {http,ftp,https}://ftp.gnu.org/gnu/autoconf @@ -26,8 +24,8 @@ do_companion_tools_autoconf_build() { CT_DoExecLog CFG ${CONFIG_SHELL} \ "${CT_SRC_DIR}/autoconf-${CT_AUTOCONF_VERSION}/configure" \ --prefix="${CT_BUILDTOOLS_PREFIX_DIR}" - CT_DoExecLog ALL ${make} - CT_DoExecLog ALL ${make} install + CT_DoExecLog ALL make + CT_DoExecLog ALL make install CT_Popd CT_EndStep } diff --git a/scripts/build/companion_tools/300-automake.sh b/scripts/build/companion_tools/300-automake.sh index ff286dd..52f62d2 100644 --- a/scripts/build/companion_tools/300-automake.sh +++ b/scripts/build/companion_tools/300-automake.sh @@ -1,7 +1,5 @@ # Build script for automake -CT_AUTOMAKE_VERSION=1.11.1 - do_companion_tools_automake_get() { CT_GetFile "automake-${CT_AUTOMAKE_VERSION}" \ {http,ftp,https}://ftp.gnu.org/gnu/automake @@ -21,8 +19,8 @@ do_companion_tools_automake_build() { CT_DoExecLog CFG \ "${CT_SRC_DIR}/automake-${CT_AUTOMAKE_VERSION}/configure" \ --prefix="${CT_BUILDTOOLS_PREFIX_DIR}" - CT_DoExecLog ALL ${make} - CT_DoExecLog ALL ${make} install + CT_DoExecLog ALL make + CT_DoExecLog ALL make install CT_Popd CT_EndStep } diff --git a/scripts/build/companion_tools/400-libtool.sh b/scripts/build/companion_tools/400-libtool.sh index fa5dc59..cfe0f63 100644 --- a/scripts/build/companion_tools/400-libtool.sh +++ b/scripts/build/companion_tools/400-libtool.sh @@ -1,7 +1,5 @@ # Build script for libtool -CT_LIBTOOL_VERSION=2.4.6 - do_companion_tools_libtool_get() { CT_GetFile "libtool-${CT_LIBTOOL_VERSION}" \ {http,ftp,https}://ftp.gnu.org/gnu/libtool @@ -21,8 +19,8 @@ do_companion_tools_libtool_build() { CT_DoExecLog CFG \ "${CT_SRC_DIR}/libtool-${CT_LIBTOOL_VERSION}/configure" \ --prefix="${CT_BUILDTOOLS_PREFIX_DIR}" - CT_DoExecLog ALL ${make} - CT_DoExecLog ALL ${make} install + CT_DoExecLog ALL make + CT_DoExecLog ALL make install CT_Popd CT_EndStep } |