Merge branch 'yacc-work'

diff --cc ChangeLog
index cb4b3af2eda0bba025eec04f7012cfcce3559c5f,31adec7a796afd27574cdff7c85429c2379f92cf..b432d49350756d868ad2088eb4b2255279542fd5
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,17 -1,12 +1,26 @@@
+ 2011-01-12   Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       docs: clustered '-d' not recognized in YFLAGS
+       This change fixes automake bug#7828.
+       * doc/automake.texi (Yacc and Lex): Document that automake
+       recognizes '-d' in AM_YFLAGS only if it's not clustered with
+       other options.
+       From a report by Юрий Пухальский.
+ 
 +2011-01-10   Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: add checks on automatically-distributed files
 +      Related to automake bug#7819.
 +      * tests/autodist.test: New test.
 +      * tests/autodist-subdir.test: Likewise.
 +      * tests/autodist-acconfig.test: Likewise.
 +      * tests/autodist-acconfig-no-subdir.test: Likewise.
 +      * tests/autodist-aclocal-m4.test: Likewise.
 +      * tests/autodist-config-headers.test: Likewise.
 +      * tests/autodist-configure-no-subdir.test: Likewise.
 +      * tests/autodist-stamp-vti.test: Likewise.
 +      * tests/Makefile.am (TESTS): Update.
 +
  2011-01-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        tests: do not force yacc-requiring tests to use bison

diff --cc doc/automake.texi
Simple merge