[PATCH] maint: automake recommends *.texi now

[Eric Blake]

See this email for the motivation:
https://lists.gnu.org/archive/html/automake-patches/2013-01/msg00009.html

* doc/m4.texinfo: Move...
* doc/m4.texi: ...here, for the eventual automake 1.14.
* HACKING: Reflect the rename.
* doc/Makefile.am (info_TEXINFOS): Likewise.
* checks/Makefile.am ($(srcdir)/stamp-checks): Likewise.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog                   | 9 +++++++++
 HACKING                     | 2 +-
 checks/Makefile.am          | 4 ++--
 doc/Makefile.am             | 2 +-
 doc/{m4.texinfo => m4.texi} | 0
 5 files changed, 13 insertions(+), 4 deletions(-)
 rename doc/{m4.texinfo => m4.texi} (100%)

diff --git a/ChangeLog b/ChangeLog
index d43dc80..5ed809f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-01-02  Eric Blake  <address@hidden>
+
+       maint: automake recommends *.texi now
+       * doc/m4.texinfo: Move...
+       * doc/m4.texi: ...here, for the eventual automake 1.14.
+       * HACKING: Reflect the rename.
+       * doc/Makefile.am (info_TEXINFOS): Likewise.
+       * checks/Makefile.am ($(srcdir)/stamp-checks): Likewise.
+
 2013-01-01  Eric Blake  <address@hidden>

        maint: bump copyright year
diff --git a/HACKING b/HACKING
index b9f7db8..56752b5 100644
--- a/HACKING
+++ b/HACKING
@@ -118,7 +118,7 @@ and is not part of a release distribution.
   linkers you can.

 * For branch-1.4, the testsuite is generated from the documentation.
-  All instances of @example in doc/m4.texinfo that are not preceeded by
+  All instances of @example in doc/m4.texi that are not preceeded by
   "@comment ignore" are turned into tests in the checks directory.


diff --git a/checks/Makefile.am b/checks/Makefile.am
index 55d4109..9265964 100644
--- a/checks/Makefile.am
+++ b/checks/Makefile.am
@@ -24,9 +24,9 @@ EXTRA_DIST = get-them check-them stamp-checks stackovf.test 
$(DOC_CHECKS)

 all-local: $(srcdir)/stamp-checks

-$(srcdir)/stamp-checks: $(srcdir)/get-them $(top_srcdir)/doc/m4.texinfo
+$(srcdir)/stamp-checks: $(srcdir)/get-them $(top_srcdir)/doc/m4.texi
        rm -f $(DOC_CHECKS)
-       cd $(srcdir) && AWK=$(AWK) ./get-them ../doc/m4.texinfo
+       cd $(srcdir) && AWK=$(AWK) ./get-them ../doc/m4.texi
        echo stamp >$@

 MAINTAINERCLEANFILES = $(DOC_CHECKS) $(srcdir)/stamp-checks
diff --git a/doc/Makefile.am b/doc/Makefile.am
index fad0ac3..d701edd 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -19,7 +19,7 @@
 ##
 ## This file written by Eric Blake <address@hidden>

-info_TEXINFOS = m4.texinfo
+info_TEXINFOS = m4.texi
 m4_TEXINFOS = fdl-1.3.texi gpl-3.0.texi
 man_MANS = $(srcdir)/m4.1
 EXTRA_DIST = $(man_MANS) gendocs_template
diff --git a/doc/m4.texinfo b/doc/m4.texi
similarity index 100%
rename from doc/m4.texinfo
rename to doc/m4.texi
-- 
1.8.0.2