The branch, master has been updated
via ef36b097 Stop checking for gmake in build scripts
from ec3833c9 Add optional netgroup.h include for NetBSD hosts.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ef36b097bfd38cdf3f331f264e0792ab76d479c8
Author: Wayne Davison <wa...@opencoder.net>
Date: Thu Feb 4 20:46:00 2021 -0800
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).
-----------------------------------------------------------------------
Summary of changes:
packaging/smart-make | 6 ++----
prepare-source | 3 +--
2 files changed, 3 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/smart-make b/packaging/smart-make
index 25aa1a35..3826432e 100755
--- 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 dd0cbd6a..f5b7b46c 100755
--- 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
--
The rsync repository.
_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
