[groff] 05/11: Rename `DOC_GROFF_ONLY` Make macro to `DOC_GROFF`.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 6b6fb677f01a462b58d70ed82025a9feddfc86cf
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Wed Mar 23 19:25:27 2022 +1100

    Rename `DOC_GROFF_ONLY` Make macro to `DOC_GROFF`.
    
    * contrib/sboxes/sboxes.am:
    * doc/doc.am: Do it.
    
    Thanks to Ingo Schwarze for the discussion.
---
 ChangeLog                |  4 ++++
 contrib/sboxes/ChangeLog |  4 ++++
 contrib/sboxes/sboxes.am |  6 +++---
 doc/doc.am               | 26 +++++++++++++-------------
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e8ee61de..cac62224 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,10 @@
 
 2022-04-05  G. Branden Robinson <g.branden.robinson@gmail.com>
 
+       * doc/doc.am: Rename `DOC_GROFF_ONLY` to `DOC_GROFF`.
+
+2022-03-29  G. Branden Robinson <g.branden.robinson@gmail.com>
+
        * doc/doc.am: Refactor.  Drop ghastly hack used to get file
        names into troff diagnostics when reading from standard input.
        We've refactored so that it no longer does, making the hack
diff --git a/contrib/sboxes/ChangeLog b/contrib/sboxes/ChangeLog
index 86f6999d..3bb9664b 100644
--- a/contrib/sboxes/ChangeLog
+++ b/contrib/sboxes/ChangeLog
@@ -10,6 +10,10 @@
        * sboxes.am: Stop installing msboxes.ms.in;
        installing msboxes.ms and msboxes.pdf is enough.
 
+2022-03-29  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * sboxes.am: Track rename of `DOC_GROFF_ONLY` to `DOC_GROFF`.
+
 2022-03-29  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * msboxes.ms.in: Tweak sboxes documentation to imply ms
diff --git a/contrib/sboxes/sboxes.am b/contrib/sboxes/sboxes.am
index b12c9369..8f148432 100644
--- a/contrib/sboxes/sboxes.am
+++ b/contrib/sboxes/sboxes.am
@@ -1,7 +1,6 @@
 # Copyright (C) 2021 Free Software Foundation, Inc.
 #      Written by Bertrand Garrigues <bertrand.garrigues@laposte.net>
 #
-#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -55,8 +54,9 @@ $(sboxes_builddir)/msboxes.ms: $(SBOXES_EXAMPLEFILES) 
$(sboxesnotquine)
        $(AM_V_GEN)mv $@.tmp $@
 
 $(sboxes_builddir)/msboxes.pdf: $(sboxes_builddir)/msboxes.ms \
-  $(dist_sboxestmac_DATA) groff troff gropdf font/devpdf/build_font_files
-       $(GROFF_V)$(DOC_GROFF_ONLY) -M$(sboxes_srcdir) -ms -msboxes -Tpdf \
+  $(dist_sboxestmac_DATA) groff troff gropdf \
+  font/devpdf/build_font_files
+       $(GROFF_V)$(DOC_GROFF) -M$(sboxes_srcdir) -ms -msboxes -Tpdf \
          $(sboxes_builddir)/msboxes.ms > $@
 
 uninstall_groffdirs: uninstall_sboxes
diff --git a/doc/doc.am b/doc/doc.am
index 90415aa7..3bcdabfd 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -33,7 +33,7 @@ DOC_SED = $(SED) \
 # It includes flags to locate its tmac and device/font description
 # directories and to produce verbose diagnostics in the event of syntax
 # or formatting problems.
-DOC_GROFF_ONLY=\
+DOC_GROFF=\
   GROFF_COMMAND_PREFIX= \
   GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
   $(GROFFBIN) -I$(abs_top_builddir) -M $(doc_srcdir) $(TFLAG) $(FFLAG) \
@@ -228,13 +228,13 @@ man-clean:
 
 # Many pages use tbl, a few use eqn, and soelim(1) uses pic.
 doc/groff-man-pages.pdf: $(GROFF_MAN_PAGES_ALL) eqn pic tbl
-       $(GROFF_V)$(DOC_GROFF_ONLY) -pet -Tpdf -P-e -mandoc -rC1 \
+       $(GROFF_V)$(DOC_GROFF) -pet -Tpdf -P-e -mandoc -rC1 \
          -rCHECKSTYLE=3 $(GROFF_MAN_PAGES1) \
          $(tmac_srcdir)/sv.tmac $(GROFF_MAN_PAGES2) \
          $(tmac_srcdir)/en.tmac $(GROFF_MAN_PAGES3) > $@
 
 doc/groff-man-pages.utf8.txt: $(GROFF_MAN_PAGES_ALL) eqn pic tbl
-       $(GROFF_V)$(DOC_GROFF_ONLY) -pet -Tutf8 -mandoc \
+       $(GROFF_V)$(DOC_GROFF) -pet -Tutf8 -mandoc \
          -rCHECKSTYLE=3 $(GROFF_MAN_PAGES1) \
          $(tmac_srcdir)/sv.tmac $(GROFF_MAN_PAGES2) \
          $(tmac_srcdir)/en.tmac $(GROFF_MAN_PAGES3) > $@
@@ -242,7 +242,7 @@ doc/groff-man-pages.utf8.txt: $(GROFF_MAN_PAGES_ALL) eqn 
pic tbl
 doc/grnexmpl.ps: $(doc_srcdir)/grnexmpl.me $(doc_srcdir)/grnexmpl.g \
   grn eqn
        $(GROFF_V)$(MKDIR_P) `dirname $@` \
-       && $(DOC_GROFF_ONLY) -Tps -ge -me $(doc_srcdir)/grnexmpl.me >$@
+       && $(DOC_GROFF) -Tps -ge -me $(doc_srcdir)/grnexmpl.me >$@
 
 $(PROCESSEDDOCFILES_PS): \
   $(dist_devpsfont_DATA) $(nodist_devpsfont_DATA)
@@ -287,30 +287,30 @@ SUFFIXES += .me.in .me
 
 .me.ps:
        $(GROFF_V)$(MKDIR_P) `dirname $@` \
-       && $(DOC_GROFF_ONLY) -Tps -me $< >$@
+       && $(DOC_GROFF) -Tps -me $< >$@
 
 doc/meintro_fr.ps: doc/meintro_fr.me preconv
        $(GROFF_V)$(MKDIR_P) `dirname $@` \
-       && $(DOC_GROFF_ONLY) -k -Tps -me -mfr $< >$@
+       && $(DOC_GROFF) -k -Tps -me -mfr $< >$@
 
 doc/ms.ps: $(doc_srcdir)/ms.ms
        $(GROFF_V)$(MKDIR_P) `dirname $@` \
-       && $(DOC_GROFF_ONLY) -t -Tps -ms $(doc_srcdir)/ms.ms >$@
+       && $(DOC_GROFF) -t -Tps -ms $(doc_srcdir)/ms.ms >$@
 
 doc/pic.ps: $(doc_srcdir)/pic.ms eqn pic tbl
        $(GROFF_V)$(MKDIR_P) `dirname $@` \
-       && $(DOC_GROFF_ONLY) -pet -Tps -ms $(doc_srcdir)/pic.ms >$@
+       && $(DOC_GROFF) -pet -Tps -ms $(doc_srcdir)/pic.ms >$@
 
 doc/webpage.ps: $(DOC_GNU_EPS) tmac/www.tmac tbl
 doc/webpage.ps: $(doc_srcdir)/webpage.ms
        $(GROFF_V)$(MKDIR_P) `dirname $@` \
-       && $(DOC_GROFF_ONLY) -I $(doc_builddir) -I $(doc_srcdir) -Tps \
-         -t -Tps -ms -mwww $(doc_srcdir)/webpage.ms >$@
+       && $(DOC_GROFF) -I $(doc_srcdir) -I $(doc_builddir) -t -Tps \
+         -ms -mwww $(doc_srcdir)/webpage.ms >$@
 
 # We have no "generic" ms documents.
 #.ms.ps:
 #      $(GROFF_V)$(MKDIR_P) `dirname $@` \
-#      && $(DOC_GROFF_ONLY) -Tps -ms $< >$@
+#      && $(DOC_GROFF) -Tps -ms $< >$@
 
 $(PROCESSEDEXAMPLEFILES) $(PROCESSEDDOCFILES): \
   $(bin_PROGRAMS) \
@@ -332,7 +332,7 @@ doc/pic.html: $(devhtmlfont_DATA)
 doc/pic.html: $(doc_srcdir)/pic.ms
        $(GROFF_V)$(MKDIR_P) $(doc_builddir) \
        && cd $(doc_builddir) \
-       && $(DOC_GROFF_ONLY) -pet -P-Ipic -P-Dimg -P-jpic -Thtml -ms \
+       && $(DOC_GROFF) -pet -P-Ipic -P-Dimg -P-jpic -Thtml -ms \
          $(doc_srcdir)/pic.ms > pic.html
 
 doc/webpage.html: tmac/www.tmac
@@ -344,7 +344,7 @@ doc/webpage.html: $(DOC_GNU_EPS) $(doc_srcdir)/groff.css
 doc/webpage.html: $(doc_srcdir)/webpage.ms
        $(GROFF_V)$(MKDIR_P) $(doc_builddir) \
        && cd $(doc_builddir) \
-       && $(DOC_GROFF_ONLY) -t -I $(doc_builddir) -I $(doc_srcdir) \
+       && $(DOC_GROFF) -t -I $(doc_builddir) -I $(doc_srcdir) \
          -P-jwebpage -P-nrb -P-Iwebpage -P-Dimg -Thtml -ms \
          $(doc_srcdir)/webpage.ms > webpage.html