From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 28 Dec 2012 19:05:51 +0000 (+0100)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7801987fbd34c40d63fb249fa1796866d3b8baf6;p=thirdparty%2Fautomake.git

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>
---

7801987fbd34c40d63fb249fa1796866d3b8baf6
diff --cc configure.ac
index a9d26e55a,f97ec87e5..0e4d7772e
--- a/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 t/yacc-d-basic.sh
index 5cb2a8e56,a03065d3f..fae70d514
--- a/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.