diff options
| author | Eric Blake <eblake@redhat.com> | 2013-01-02 10:04:48 -0700 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2013-01-02 10:04:48 -0700 |
| commit | 44a4b5e5ba98be885e3d8dc76cb639271782cd89 (patch) | |
| tree | d2cfe25c8441f09de1ecd784a5234e49edb4be65 | |
| parent | 36b1c91f83453499c16986b79191df2746deed50 (diff) | |
| download | m4-44a4b5e5ba98be885e3d8dc76cb639271782cd89.tar.gz | |
maint: automake recommends *.texi now
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 <eblake@redhat.com>
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | HACKING | 2 | ||||
| -rw-r--r-- | checks/Makefile.am | 4 | ||||
| -rw-r--r-- | doc/Makefile.am | 2 | ||||
| -rw-r--r-- | doc/m4.texi (renamed from doc/m4.texinfo) | 0 |
5 files changed, 13 insertions, 4 deletions
@@ -1,3 +1,12 @@ +2013-01-02 Eric Blake <eblake@redhat.com> + + 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 <eblake@redhat.com> maint: bump copyright year @@ -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 55d4109f..92659645 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 fad0ac31..d701edd6 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -19,7 +19,7 @@ ## ## This file written by Eric Blake <ebb9@byu.net> -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 index b8b1704d..b8b1704d 100644 --- a/doc/m4.texinfo +++ b/doc/m4.texi |