From e54e3f907b024c7fa7fe3af9a5383f4b153e8fba Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 1 Aug 2020 16:57:01 -0700
Subject: make fetch

---
 GNUmakefile           | 2 +-
 lib/Autom4te/XFile.pm | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 770923b8..bf052693 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -104,7 +104,7 @@ endif
 
 abort-due-to-no-makefile:
 	@echo There seems to be no Makefile in this directory.   1>&2
-	@echo "You must run ./configure before running '$(MAKE)'." 1>&2
+	@echo "You must run ./configure before running 'make'." 1>&2
 	@exit 1
 
 endif
diff --git a/lib/Autom4te/XFile.pm b/lib/Autom4te/XFile.pm
index feebce0e..b125a798 100644
--- a/lib/Autom4te/XFile.pm
+++ b/lib/Autom4te/XFile.pm
@@ -232,7 +232,8 @@ sub lock
 
   # Unless explicitly configured otherwise, Perl implements its 'flock' with the
   # first of flock(2), fcntl(2), or lockf(3) that works.  These can fail on
-  # NFS-backed files, with ENOLCK (GNU/Linux) or EOPNOTSUPP (FreeBSD); we
+  # NFS-backed files, with ENOLCK (GNU/Linux) or EOPNOTSUPP (FreeBSD) or
+  # EINVAL (OpenIndiana, as per POSIX 1003.1-2017 fcntl spec); we
   # usually ignore these errors.  If $ENV{MAKEFLAGS} suggests that a parallel
   # invocation of 'make' has invoked the tool we serve, report all locking
   # failures and abort.
@@ -251,7 +252,7 @@ sub lock
 
       msg ($make_j ? 'fatal' : 'unsupported',
 	   "cannot lock $file with mode $mode: $!" . ($make_j ? $note : ""))
-	if $make_j || !($!{ENOLCK} || $!{EOPNOTSUPP});
+	if $make_j || !($!{EINVAL} || $!{ENOLCK} || $!{EOPNOTSUPP});
     }
 }
 
-- 
cgit v1.2.1