Stop checking for gmake in build scripts

Since a non-cygwin gmake trips up the github cygwin action, let's just
require that the user put a good "make" early on their path (a simple
`ln -s `which gmake` ~/bin/make` with the right $PATH works fine).

diff --git a/packaging/smart-make b/packaging/smart-make
index 25aa1a35958e7e43e1a9f102f351cfe69c9a20b2..3826432ecb936187b4cf34c4915977a64f4aac1c 100755 (executable)
--- a/packaging/smart-make
+++ b/packaging/smart-make
@@ -4,8 +4,6 @@ set -e
 
 export LANG=C
 
-make=`which gmake 2>/dev/null` || make=make
-
 branch=`packaging/prep-auto-dir`
 if test x"$branch" = x; then
     srcdir=.
@@ -40,8 +38,8 @@ fi
 
 ./config.status
 
-$make all
+make all
 
 if test x"$1" = x"check"; then
-    $make check
+    make check
 fi

diff --git a/prepare-source b/prepare-source
index dd0cbd6acc85a163e76ee57b14dcbfcfdc452d02..f5b7b46ca6c43b7d535b1a0dbaaec1e9b6f2c7c6 100755 (executable)
--- a/prepare-source
+++ b/prepare-source
@@ -43,8 +43,7 @@ fi
 for action in "${@}"; do
     case "$action" in
     build|make)
-       make=`which gmake 2>/dev/null` || make=make
-       $make -f "$dir/prepare-source.mak"
+       make -f "$dir/prepare-source.mak"
        ;;
     fetch|fetchgen)
        if test "$action" = fetchgen; then