From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 31 Dec 2012 13:38:23 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v1.16~141
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51defae0a5af847d6c69de685b8997ae9178584d;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  docs: adjust comment w.r.t. recent tests renaming
  tests: some more renames for texinfo tests

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

51defae0a5af847d6c69de685b8997ae9178584d
diff --cc t/list-of-tests.mk
index 458a9e8d3,3c27e8f46..cd5a9ec72
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@@ -1157,20 -1157,33 +1157,32 @@@ t/target-cflags.sh 
  t/targetclash.sh \
  t/tests-environment-fd-redirect.sh \
  t/tests-environment-and-log-compiler.sh \
- t/txinfo.sh \
- t/txinfo-no-extra-dist.sh \
- t/txinfo-suffix-less-info.sh \
- t/txinfo-unrecognized-info-suffix.sh \
- t/txinfo-other-suffixes.sh \
+ t/txinfo-absolute-srcdir-pr408.sh \
  t/txinfo-add-missing-and-dist.sh \
- t/txinfo-no-repeated-targets.sh \
- t/txinfo10.sh \
- t/txinfo-subdir-pr343.sh \
+ t/txinfo-bsd-make-recurs.sh \
+ t/txinfo-clean.sh \
+ t/txinfo-dvi-recurs.sh \
  t/txinfo-info-in-srcdir.sh \
- t/txinfo-setfilename-repeated.sh \
- t/txinfo20.sh \
+ t/txinfo-makeinfo-error-no-clobber.sh \
  t/txinfo-many-output-formats.sh \
+ t/txinfo-no-clutter.sh \
+ t/txinfo-no-extra-dist.sh \
+ t/txinfo-no-installinfo.sh \
+ t/txinfo-no-repeated-targets.sh \
+ t/txinfo-other-suffixes.sh \
+ t/txinfo-override-infodeps.sh \
  t/txinfo-override-texinfo-tex.sh \
+ t/txinfo-setfilename-repeated.sh \
+ t/txinfo-setfilename-suffix-strip.sh \
+ t/txinfo-subdir-pr343.sh \
+ t/txinfo-tex-dist.sh \
+ t/txinfo-unrecognized-extension.sh \
+ t/txinfo-unrecognized-info-suffix.sh \
+ t/txinfo-vtexi.sh \
+ t/txinfo-vtexi2.sh \
+ t/txinfo-vtexi3.sh \
+ t/txinfo-vtexi4.sh \
+ t/txinfo-without-info-suffix.sh \
 -t/txinfo19.sh \
  t/txinfo23.sh \
  t/txinfo24.sh \
  t/txinfo25.sh \