make fetch

diff --git a/GNUmakefile b/GNUmakefile
index 770923b8574057b380f6a725fca7fc22a29203f3..bf052693e69f6f208ea1767cca57638fddb41cd7 100644 (file)
--- 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 feebce0e35df656f0d29cadf5f2e27feeac4f800..b125a7981eff7cd61069bc09f4d279ebbfae1782 100644 (file)
--- 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});
     }
 }