Merge branch 'master' into ng/master

* master:
  post-release: major version bump
  post-release: minor version bump
  release: stable major release 1.13
  news: fix botched URL
  ylwrap: various fixes
  tests: strengthen the ylwrap tests
  NEWS: we plan to ditch MS-DOS/DJGPP support in future Automake versions

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --cc configure.ac
index a9d26e55acf59d9508788c2996c8a703e5553127,f97ec87e534e7456a9e7325081aa0a1128f83a5b..0e4d7772e37da287edc4e6b5fd30b6bcb5dc2bbe
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -16,7 -16,7 +16,7 @@@
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  AC_PREREQ([2.69])
- AC_INIT([GNU Automake-NG], [1.12c], [automake-ng@gnu.org])
 -AC_INIT([GNU Automake], [1.13a], [bug-automake@gnu.org])
++AC_INIT([GNU Automake-NG], [1.13a], [automake-ng@gnu.org])
  
  AC_CONFIG_SRCDIR([automake.in])
  AC_CONFIG_AUX_DIR([lib])

diff --cc lib/ylwrap
Simple merge

diff --cc t/yacc-d-basic.sh
index 5cb2a8e5659c11d2d7b97bc6df08fa9aab3354cd,a03065d3f8dbd5d4619e52cd0ef0b3087e917249..fae70d5142d4031853d15d2079523b2c37c51be7
--- 1/t/yacc-d-basic.sh
--- 2/t/yacc-d-basic.sh
+++ b/t/yacc-d-basic.sh
@@@ -130,15 -141,12 +141,12 @@@ cd .
  
  $MAKE distdir
  ls -l $distdir
- test -f $distdir/foo/parse.c
- test -f $distdir/foo/parse.h
- test -f $distdir/bar/parse.c
- test -f $distdir/bar/parse.h
- test -f $distdir/baz/zardoz-parse.c
- test -f $distdir/baz/zardoz-parse.h
+ for i in $generated; do
+   test -f $distdir/$i
+ done
  
  # Sanity check the distribution.
 -yl_distcheck
 +$MAKE distcheck
  
  # While we are at it, make sure that 'parse.c' and 'parse.h' are erased
  # by maintainer-clean, and not by distclean.