5 files changed, 1 insertions, 11 deletions
diff --git a/scripts/build/companion_tools/050-make.sh b/scripts/build/companion_tools/050-make.sh
index 42475458..9458a255 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
@@ -22,7 +20,7 @@ do_companion_tools_make_build() {
                      --prefix="${CT_BUILDTOOLS_PREFIX_DIR}"
     CT_DoExecLog ALL make
     CT_DoExecLog ALL make install
-    if [ "${CT_COMP_TOOLS_make_gmake}" = "y" ]; then
+    if [ "${CT_MAKE_GMAKE_SYMLINK}" = "y" ]; then
         CT_DoExecLog ALL ln -sv make "${CT_BUILDTOOLS_PREFIX_DIR}/bin/gmake"
     fi
     CT_Popd
diff --git a/scripts/build/companion_tools/100-m4.sh b/scripts/build/companion_tools/100-m4.sh
index dd8380e1..83ab8159 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
diff --git a/scripts/build/companion_tools/200-autoconf.sh b/scripts/build/companion_tools/200-autoconf.sh
index 78e1b32f..e6e5764d 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
diff --git a/scripts/build/companion_tools/300-automake.sh b/scripts/build/companion_tools/300-automake.sh
index ae0c49be..52f62d2f 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
diff --git a/scripts/build/companion_tools/400-libtool.sh b/scripts/build/companion_tools/400-libtool.sh
index 43d1f053..cfe0f634 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