Fix the references to old config variables

Signed-off-by: Alexey Neyman <stilor@att.net>

5 files changed, 15 insertions, 29 deletions

diff --git a/scripts/build/companion_tools/050-make.sh b/scripts/build/companion_tools/050-make.sh
index 76b24aa..3253f5b 100644
--- a/scripts/build/companion_tools/050-make.sh
+++ b/scripts/build/companion_tools/050-make.sh
@@ -1,14 +1,11 @@
 # Build script for make
 
 do_companion_tools_make_get() {
-    CT_GetFile "make-${CT_MAKE_VERSION}"        \
-        {http,ftp,https}://ftp.gnu.org/gnu/make
+    CT_Fetch MAKE
 }
 
 do_companion_tools_make_extract() {
-    CT_Extract "make-${CT_MAKE_VERSION}"
-    CT_DoExecLog ALL chmod -R u+w "${CT_SRC_DIR}/make-${CT_MAKE_VERSION}"
-    CT_Patch "make" "${CT_MAKE_VERSION}"
+    CT_ExtractPatch MAKE
 }
 
 do_companion_tools_make_for_build() {
@@ -61,7 +58,7 @@ do_make_backend() {
                      CFLAGS="${cflags}" \
                      LDFLAGS="${ldflags}" \
                      ${CONFIG_SHELL} \
-                     "${CT_SRC_DIR}/make-${CT_MAKE_VERSION}/configure" \
+                     "${CT_SRC_DIR}/make/configure" \
                      --host="${host}" \
                      --prefix="${prefix}" \
 		     "${extra_config[@]}"
diff --git a/scripts/build/companion_tools/100-m4.sh b/scripts/build/companion_tools/100-m4.sh
index e0fccd7..1707d64 100644
--- a/scripts/build/companion_tools/100-m4.sh
+++ b/scripts/build/companion_tools/100-m4.sh
@@ -1,13 +1,11 @@
 # Build script for m4
 
 do_companion_tools_m4_get() {
-    CT_GetFile "m4-${CT_M4_VERSION}"          \
-        {http,ftp,https}://ftp.gnu.org/gnu/m4
+    CT_Fetch M4
 }
 
 do_companion_tools_m4_extract() {
-    CT_Extract "m4-${CT_M4_VERSION}"
-    CT_Patch "m4" "${CT_M4_VERSION}"
+    CT_ExtractPatch M4
 }
 
 do_companion_tools_m4_for_build() {
@@ -58,7 +56,7 @@ do_m4_backend() {
                      CFLAGS="${cflags}" \
                      LDFLAGS="${ldflags}" \
                      ${CONFIG_SHELL} \
-                     "${CT_SRC_DIR}/m4-${CT_M4_VERSION}/configure" \
+                     "${CT_SRC_DIR}/m4/configure" \
                      --host="${host}" \
                      --prefix="${prefix}"
 
diff --git a/scripts/build/companion_tools/200-autoconf.sh b/scripts/build/companion_tools/200-autoconf.sh
index bccef75..52149ea 100644
--- a/scripts/build/companion_tools/200-autoconf.sh
+++ b/scripts/build/companion_tools/200-autoconf.sh
@@ -1,14 +1,11 @@
 # Build script for autoconf
 
 do_companion_tools_autoconf_get() {
-    CT_GetFile "autoconf-${CT_AUTOCONF_VERSION}"    \
-        {http,ftp,https}://ftp.gnu.org/gnu/autoconf
+    CT_Fetch AUTOCONF
 }
 
 do_companion_tools_autoconf_extract() {
-    CT_Extract "autoconf-${CT_AUTOCONF_VERSION}"
-    CT_DoExecLog ALL chmod -R u+w "${CT_SRC_DIR}/autoconf-${CT_AUTOCONF_VERSION}"
-    CT_Patch "autoconf" "${CT_AUTOCONF_VERSION}"
+    CT_ExtractPatch AUTOCONF
 }
 
 do_companion_tools_autoconf_for_build() {
@@ -42,7 +39,7 @@ do_autoconf_backend() {
     CT_DoLog EXTRA "Configuring autoconf"
     CT_DoExecLog CFG \
     ${CONFIG_SHELL} \
-    "${CT_SRC_DIR}/autoconf-${CT_AUTOCONF_VERSION}/configure" \
+    "${CT_SRC_DIR}/autoconf/configure" \
                      --host="${host}" \
                      --prefix="${prefix}"
 
diff --git a/scripts/build/companion_tools/300-automake.sh b/scripts/build/companion_tools/300-automake.sh
index ee76463..2d7eded 100644
--- a/scripts/build/companion_tools/300-automake.sh
+++ b/scripts/build/companion_tools/300-automake.sh
@@ -1,14 +1,11 @@
 # Build script for automake
 
 do_companion_tools_automake_get() {
-    CT_GetFile "automake-${CT_AUTOMAKE_VERSION}"    \
-        {http,ftp,https}://ftp.gnu.org/gnu/automake
+    CT_Fetch AUTOMAKE
 }
 
 do_companion_tools_automake_extract() {
-    CT_Extract "automake-${CT_AUTOMAKE_VERSION}"
-    CT_DoExecLog ALL chmod -R u+w "${CT_SRC_DIR}/automake-${CT_AUTOMAKE_VERSION}"
-    CT_Patch "automake" "${CT_AUTOMAKE_VERSION}"
+    CT_ExtractPatch AUTOMAKE
 }
 
 do_companion_tools_automake_for_build() {
@@ -38,7 +35,7 @@ do_automake_backend() {
     CT_DoLog EXTRA "Configuring automake"
     CT_DoExecLog CFG \
                      ${CONFIG_SHELL} \
-                     "${CT_SRC_DIR}/automake-${CT_AUTOMAKE_VERSION}/configure" \
+                     "${CT_SRC_DIR}/automake/configure" \
                      --host="${host}" \
                      --prefix="${prefix}"
 
diff --git a/scripts/build/companion_tools/400-libtool.sh b/scripts/build/companion_tools/400-libtool.sh
index 4461207..3733072 100644
--- a/scripts/build/companion_tools/400-libtool.sh
+++ b/scripts/build/companion_tools/400-libtool.sh
@@ -1,14 +1,11 @@
 # Build script for libtool
 
 do_companion_tools_libtool_get() {
-    CT_GetFile "libtool-${CT_LIBTOOL_VERSION}"     \
-        {http,ftp,https}://ftp.gnu.org/gnu/libtool
+    CT_Fetch LIBTOOL
 }
 
 do_companion_tools_libtool_extract() {
-    CT_Extract "libtool-${CT_LIBTOOL_VERSION}"
-    CT_DoExecLog ALL chmod -R u+w "${CT_SRC_DIR}/libtool-${CT_LIBTOOL_VERSION}"
-    CT_Patch "libtool" "${CT_LIBTOOL_VERSION}"
+    CT_ExtractPatch LIBTOOL
 }
 
 do_companion_tools_libtool_for_build() {
@@ -38,7 +35,7 @@ do_libtool_backend() {
     CT_DoLog EXTRA "Configuring libtool"
     CT_DoExecLog CFG \
                      ${CONFIG_SHELL} \
-                     "${CT_SRC_DIR}/libtool-${CT_LIBTOOL_VERSION}/configure" \
+                     "${CT_SRC_DIR}/libtool/configure" \
                      --host="${host}" \
                      --prefix="${prefix}"