Merge branch 'maint' into yacc-work

* maint: (28 commits)
  fix: make a test script executable
  coverage: expose automake bug#9651
  parallel-tests: automake error our on invalid TEST_EXTENSIONS
  fix: regenerate Makefile
  fix: regenerate Makefile.in files
  maintcheck: fix usage of `cd' instead of `$(am__cd)'
  docs: don't suggest installing `.m4' files in hard-coded location
  distuninstallcheck: fail also when only one file is left installed
  uninstall: "make uninstall" before "make install" works
  tests: fix tests on aclocal search path precedences
  fix: typo in NEWS
  docs: document planned precedence changes in aclocal search path
  aclocal: handle ACLOCAL_PATH environment variable
  tests: fix spurious failure in 'primary-prefix-valid-couples.test'
  docs: deprecate JAVA primary
  docs: clearer distinction between `.java' with javac and with gcj
  java: complain if java_JAVA is used but $(javadir) is undefined
  coverage: test interactions of `nobase_' and `nodist_'
  java: fix various blunders in test 'java-mix.test'
  cosmetics: fix various typos and grammaros
  ...

diff --cc ChangeLog
Simple merge

diff --cc NEWS
index 0a82689,4b4a5e8..5229777
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -102,15 -115,10 +129,19 @@@ Bugs fixed in 1.11.0a
    - Java sources specified with check_JAVA are not compiled anymore upon
      "make all", but only upon "make check".
  
 +  - Automake now detects the presence of the `-d' flag in the various
 +    `*YFLAGS' variables even when their definitions involve indirections
 +    through other variables, such as in:
 +      foo_opts = -d
 +      AM_YFLAGS = $(foo_opts)
 +
 +  - Automake now complains if a `*YFLAGS' variable has any conditional
 +    content, not only a conditional definition.
 +
+   - An usage like "java_JAVA = foo.java" will now cause Automake to warn
+     and error out if `javadir' is undefined, instead of silently producing
+     a broken Makefile.in.
+ 
    - Now aclocal and automake, when they've to spawn autoconf or autom4te
      processes, honour the configure-time definitions of AUTOCONF and
      AUTOM4TE.

diff --cc automake.in
Simple merge

diff --cc doc/automake.texi
Simple merge

diff --cc tests/Makefile.am
index a08c641,bf17aea..cbebefd
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -19,10 -19,11 +19,13 @@@
  XFAIL_TESTS = \
  all.test \
  auxdir2.test \
 +yacc-bison-skeleton-cxx.test \
 +yacc-bison-skeleton.test \
  cond17.test \
+ dist-auxfile.test \
+ dist-auxfile-2.test \
  gcj6.test \
+ java-nobase.test \
  pr8365-remake-timing.test \
  yacc-dist-nobuild-subdir.test \
  vala-vpath.test \

diff --cc tests/Makefile.in
index b59252a,f66a9c7..39fa0b2
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -284,10 -290,11 +290,13 @@@ top_srcdir = @top_srcdir
  XFAIL_TESTS = \
  all.test \
  auxdir2.test \
 +yacc-bison-skeleton-cxx.test \
 +yacc-bison-skeleton.test \
  cond17.test \
+ dist-auxfile.test \
+ dist-auxfile-2.test \
  gcj6.test \
+ java-nobase.test \
  pr8365-remake-timing.test \
  yacc-dist-nobuild-subdir.test \
  vala-vpath.test \