[groff] 02/02: Minor fixes due to renaming `groff.texinfo' to `groff.texi'.

[Werner LEMBERG]

wl pushed a commit to branch master
in repository groff.

commit 542dad5a943fb92fb9835585f0d767bad33e9991
Author: Werner Lemberg <address@hidden>
Date:   Thu Feb 12 08:00:34 2015 +0100

    Minor fixes due to renaming `groff.texinfo' to `groff.texi'.
    
    * doc/doc.am (SUFFIXES): Update.
    * m4/groff.m4 (GROFF_MAKEINFO): Update.
---
 ChangeLog      |    7 +++++++
 doc/doc.am     |    2 +-
 doc/fixinfo.sh |    4 ++--
 m4/groff.m4    |    4 ++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0913fc7..8be9941 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-02-12  Werner LEMBERG  <address@hidden>
+
+       Minor fixes due to renaming `groff.texinfo' to `groff.texi'.
+
+       * doc/doc.am (SUFFIXES): Update.
+       * m4/groff.m4 (GROFF_MAKEINFO): Update.
+
 2015-01-30  Bertrand Garrigues  <address@hidden>
 
        Automake migration and Gnulib integration.
diff --git a/doc/doc.am b/doc/doc.am
index b3a3cc5..abc5534 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -119,7 +119,7 @@ EXTRA_DIST += \
   doc/fixinfo.sh \
   doc/txi-en.tex
 
-SUFFIXES += .me .ms .ps .html .txt .texinfo .dvi .pdf .xhtml
+SUFFIXES += .me .ms .ps .html .txt .texi .dvi .pdf .xhtml
 
 # For simplicity, we always call preconv, grn, and eqn.
 .me.txt:
diff --git a/doc/fixinfo.sh b/doc/fixinfo.sh
index 1c48d99..47127f8 100644
--- a/doc/fixinfo.sh
+++ b/doc/fixinfo.sh
@@ -3,7 +3,7 @@
 # Fix a problem with HTML output produced by makeinfo
 #   (tested with versions 4.8 and 4.13).
 #
-# groff.texinfo uses (after macro expansion) something like
+# groff.texi uses (after macro expansion) something like
 #
 #   @deffn ...
 #   @XXindex ...
@@ -19,7 +19,7 @@
 # @deffn and @deffnx.
 #
 # Note that this script is a quick hack and tightly bound to the current
-# groff.texinfo macro code.  Hopefully, a new texinfo version makes it
+# groff.texi macro code.  Hopefully, a new texinfo version makes it
 # unnecessary.
 #
 # 09-2014: no more problem with texinfo 5.0 or higher
diff --git a/m4/groff.m4 b/m4/groff.m4
index 9553b2b..166278c 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -177,13 +177,13 @@ AC_DEFUN([GROFF_MAKEINFO],
        infofile=doc/groff.info
        test -f ${infofile} || infofile=${srcdir}/${infofile}
        if test ! -f ${infofile} \
-       || test ${srcdir}/doc/groff.texinfo -nt ${infofile}; then
+       || test ${srcdir}/doc/groff.texi -nt ${infofile}; then
         AC_MSG_ERROR($missing
 [Get the `texinfo' package version 4.8 or newer.])
        else
         AC_MSG_WARN($missing
 [Get the `texinfo' package version 4.8 or newer if you want to convert
-`groff.texinfo' into a PDF or HTML document.])
+`groff.texi' into a PDF or HTML document.])
        fi
      fi