[groff] 05/06: doc/doc.am: Relocate some pattern rules.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 8080238bcc2deeaa70103dd8d52b90bc123e8628
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Thu Nov 11 09:27:56 2021 +1100

    doc/doc.am: Relocate some pattern rules.
    
    * doc/doc.am (.texi.txt, .texi.html): Reorder pattern rules to make it
      clearer which formats require only `makeinfo` and which require
      `texi2dvi`.  The latter imposes more build dependencies, including a
      full TeX installation.
---
 ChangeLog  |  7 +++++++
 doc/doc.am | 42 ++++++++++++++++++++++--------------------
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8c8271d..f89d50a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2021-11-11  G. Branden Robinson <g.branden.robinson@gmail.com>
 
+       * doc/doc.am (.texi.txt, .texi.html): Reorder pattern rules to
+       make it clearer which formats require only `makeinfo` and which
+       require `texi2dvi`.  The latter imposes more build dependencies,
+       including a full TeX installation.
+
+2021-11-11  G. Branden Robinson <g.branden.robinson@gmail.com>
+
        [mom]: Build more quietly.
 
        * contrib/mom/mom.am (penguin.{ps,.pdf}: Make targets quiet by
diff --git a/doc/doc.am b/doc/doc.am
index 6f26249..53613bc 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -329,6 +329,8 @@ endif
 # to configure.
 
 all: build_infodoc
+
+# Rules to generate various doc files from .texi files.
 if BUILD_INFODOC
 build_infodoc: doc/groff.info
 groffinfodir = $(infodir)
@@ -345,13 +347,6 @@ build_infodoc:
 endif
 EXTRA_DIST += doc/groff.texi doc/fdl.texi
 
-# GNU Make has a built-in variable TEXI2DVI but it is not the case of
-# all 'make' implementation.  As it default to 'texi2dvi' we simply
-# redefine it here.
-
-TEXI2DVI = texi2dvi
-texi2dvi_missing = no
-# Rules to generate various doc files from .texi files.
 .texi.txt:
        $(AM_V_at)$(MKDIR_P) $(doc_builddir)
        $(AM_V_GEN)LANG=C \
@@ -359,6 +354,26 @@ texi2dvi_missing = no
        $(MAKEINFO) --enable-encoding -I$(doc_srcdir) --plaintext \
          -o $@ $<
 
+# This will generate both html split into several files and html doc
+# in a single file.
+.texi.html:
+       $(AM_V_at)$(MKDIR_P) $(doc_builddir)/
+       $(AM_V_GEN)LANG=C \
+       LC_ALL=C \
+       $(MAKEINFO) --html -I $(doc_srcdir) \
+         -o doc/`basename $@`.node $<
+       $(AM_V_at)LANG=C \
+       LC_ALL=C \
+       $(MAKEINFO) --html -I $(doc_srcdir) --no-split \
+         -o $@ $<
+
+# GNU Make has a built-in variable TEXI2DVI but it is not the case of
+# all 'make' implementation.  As it default to 'texi2dvi' we simply
+# redefine it here.
+
+TEXI2DVI = texi2dvi
+texi2dvi_missing = no
+
 .texi.dvi:
 if HAVE_TEXI2DVI
        $(AM_V_at)$(MKDIR_P) $(doc_builddir)
@@ -388,19 +403,6 @@ else
        exit 1
 endif
 
-# This will generate both html split into several files and html doc
-# in a single file.
-.texi.html:
-       $(AM_V_at)$(MKDIR_P) $(doc_builddir)/
-       $(AM_V_GEN)LANG=C \
-       LC_ALL=C \
-       $(MAKEINFO) --html -I $(doc_srcdir) \
-         -o doc/`basename $@`.node $<
-       $(AM_V_at)LANG=C \
-       LC_ALL=C \
-       $(MAKEINFO) --html -I $(doc_srcdir) --no-split \
-         -o $@ $<
-
 # Targets to make all the doc in all formats. These doc are not built
 # by default. pdf, dvi, ps, html and their install equivalent
 # install-pdf, install-dvi, install-ps, install-html are standard