Merge branch 'master' into ng/master

* master:
  tests: fix spurious failures caused by uses of 'configure.in'
  install-mans: avoid spurious failure with NetBSD make
  install: don't create empty dirs when an empty 'foo_PRIMARY' is used
  aclocal: remove a couple of useless imports
  aclocal: create local directory where to install m4 files
  python: avoid failures due to $(am__py_compile) being undefined
  python: expose automake bug#10995
  tests: one more use of 'unindent' function
  tests: remove redundant 'set -e' calls
  tests: fix spurious failure with older m4
  tests: avoid spurious failures in get-sysconf.test
  scripts: bump the depcomp scriptversion
  sync: some auxiliary files synced from upstream
  coverage: an empty foo_PRIMARY should create directory $(foodir)
  coverage: make sure am__py_compile is defined when needed
  coverage: expose automake bug#10997
  coverage: expose automake bug#10975
  getopt: relax version requirement for perl

diff --cc lib/am/lisp.am
Simple merge

diff --cc tests/Makefile.am
index e5ae5d2dd8d650fd4799791d6f0b54e950b841d1,baebb1fec9c91acd1ca7a79870bdaee6338d711d..33ef172aa5b768b2935de4a5740edfc968be8045
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -38,8 -38,9 +38,10 @@@ yacc-bison-skeleton-cxx.test 
  yacc-bison-skeleton.test \
  cond17.test \
  gcj6.test \
 +interp3.test \
  override-conditional-2.test \
+ dist-pr109765.test \
+ instdir-cond2.test \
  java-nobase.test \
  objext-pr10128.test \
  parallel-tests-many.test \

diff --cc tests/list-of-tests.mk
Simple merge

diff --cc tests/yacc-bison-skeleton-cxx.test
Simple merge

diff --cc tests/yacc-bison-skeleton.test
Simple merge

diff --cc tests/yacc-cxx.test
Simple merge

diff --cc tests/yacc-d-cxx.test
Simple merge