1 files changed, 26 insertions, 12 deletions

diff --git a/scripts/build/companion_tools/050-make.sh b/scripts/build/companion_tools/050-make.sh
index 44487c1..df77d5b 100644
--- a/scripts/build/companion_tools/050-make.sh
+++ b/scripts/build/companion_tools/050-make.sh
@@ -1,17 +1,17 @@
 # Build script for make
 
-do_companion_tools_make_get() {
-    CT_GetFile "make-${CT_MAKE_VERSION}"        \
-        {http,ftp,https}://ftp.gnu.org/gnu/make
+do_companion_tools_make_get()
+{
+    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}"
+do_companion_tools_make_extract()
+{
+    CT_ExtractPatch MAKE
 }
 
-do_companion_tools_make_for_build() {
+do_companion_tools_make_for_build()
+{
     CT_DoStep INFO "Installing make for build"
     CT_mkdir_pushd "${CT_BUILD_DIR}/build-make-build"
     do_make_backend \
@@ -23,10 +23,14 @@ do_companion_tools_make_for_build() {
     if [ "${CT_MAKE_GMAKE_SYMLINK}" = "y" ]; then
         CT_DoExecLog ALL ln -sv make "${CT_BUILD_COMPTOOLS_DIR}/bin/gmake"
     fi
+    if [ "${CT_MAKE_GNUMAKE_SYMLINK}" = "y" ]; then
+        CT_DoExecLog ALL ln -sv make "${CT_BUILD_COMPTOOLS_DIR}/bin/gnumake"
+    fi
     CT_EndStep
 }
 
-do_companion_tools_make_for_host() {
+do_companion_tools_make_for_host()
+{
     CT_DoStep INFO "Installing make for host"
     CT_mkdir_pushd "${CT_BUILD_DIR}/build-make-host"
     do_make_backend \
@@ -38,27 +42,37 @@ do_companion_tools_make_for_host() {
     if [ "${CT_MAKE_GMAKE_SYMLINK}" = "y" ]; then
         CT_DoExecLog ALL ln -sv make "${CT_PREFIX_DIR}/bin/gmake"
     fi
+    if [ "${CT_MAKE_GNUMAKE_SYMLINK}" = "y" ]; then
+        CT_DoExecLog ALL ln -sv make "${CT_PREFIX_DIR}/bin/gnumake"
+    fi
     CT_EndStep
 }
 
-do_make_backend() {
+do_make_backend()
+{
     local host
     local prefix
     local cflags
     local ldflags
+    local -a extra_config
 
     for arg in "$@"; do
         eval "${arg// /\\ }"
     done
 
+    if [ "${host}" != "${CT_BUILD}" ]; then
+        extra_config+=( --without-guile )
+    fi
+
     CT_DoLog EXTRA "Configuring make"
     CT_DoExecLog CFG \
                      CFLAGS="${cflags}" \
                      LDFLAGS="${ldflags}" \
                      ${CONFIG_SHELL} \
-                     "${CT_SRC_DIR}/make-${CT_MAKE_VERSION}/configure" \
+                     "${CT_SRC_DIR}/make/configure" \
                      --host="${host}" \
-                     --prefix="${prefix}"
+                     --prefix="${prefix}" \
+                     "${extra_config[@]}"
 
     CT_DoLog EXTRA "Building make"
     CT_DoExecLog ALL make