Merge branch 'maint' into java-work

* maint:
  * tests/amhello-binpkg.test: Add missing $EXEEXT usage.
  fix: list test 'vala-vpath.test' in XFAIL_TESTS
  tests: simplify wrapper for aclocal
  fix: minor typo in ChangeLog
  coverage: vala support failing for VPATH from-scratch builds
  docs: report few more automake parsing limitations

diff --cc ChangeLog
Simple merge

diff --cc tests/Makefile.am
index a93f4f86ff13306b06cb3f947c91b40064897c17,38f2319cfa434fde4045b619d3fd3788f2109834..41b19f7aaa2c380d7f4e118281fde71eea26456a
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -21,9 -21,9 +21,10 @@@ all.test 
  auxdir2.test \
  cond17.test \
  gcj6.test \
 +java-nobase.test \
  pr8365-remake-timing.test \
  yacc-dist-nobuild-subdir.test \
+ vala-vpath.test \
  txinfo5.test
  
  include $(srcdir)/parallel-tests.am

diff --cc tests/Makefile.in
index 3f603c7a0fd3c8d41ff033efafa7126a39c16d73,ffb2fe21d4337a864ac67465dcd5bcf183c2de4b..2cec3a06bb0fe49b2d47cddd2dd53fa1f0a0cc3f
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -286,9 -286,9 +286,10 @@@ all.test 
  auxdir2.test \
  cond17.test \
  gcj6.test \
 +java-nobase.test \
  pr8365-remake-timing.test \
  yacc-dist-nobuild-subdir.test \
+ vala-vpath.test \
  txinfo5.test
  
  parallel_tests = \

diff --cc tests/defs.in
Simple merge