[groff] 01/12: [sboxes]: Fix build nits.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 37c20378ff931fed2a55543e50becd3403ab4205
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Thu Oct 21 11:27:56 2021 +1100

    [sboxes]: Fix build nits.
    
    * contrib/sboxes/sboxes.am (SBOXES_FLAGS): Drop variable since we only
      expand it in one place.
    
      ($(sboxes_builddir)/msboxes.pdf): Be more consistent with the rest of
      our build, particularly documentation generated in the groff `doc`
      directory.  Use `GROFF_V` instead of `AM_V_GEN` to control output
      (since it is in fact groff producing the target).  Use `DOC_GROFF` to
      produce the document rather than `test-groff`.  Use the former
      `SBOXES_FLAGS` here.
---
 contrib/sboxes/ChangeLog | 11 +++++++++++
 contrib/sboxes/sboxes.am |  3 +--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/contrib/sboxes/ChangeLog b/contrib/sboxes/ChangeLog
index 85d40df..94097d3 100644
--- a/contrib/sboxes/ChangeLog
+++ b/contrib/sboxes/ChangeLog
@@ -1,3 +1,14 @@
+2021-10-21  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * sboxes.am (SBOXES_FLAGS): Drop variable since we only expand
+       it in one place.
+       ($(sboxes_builddir)/msboxes.pdf): Be more consistent with the
+       rest of our build, particularly documentation generated in the
+       groff `doc` directory.  Use `GROFF_V` instead of `AM_V_GEN` to
+       control output (since it is in fact groff producing the target).
+       Use `DOC_GROFF` to produce the document rather than
+       `test-groff`.  Use the former `SBOXES_FLAGS` here.
+
 2021-10-20  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * sboxes.am ($(sboxes_builddir)/msboxes.ms,
diff --git a/contrib/sboxes/sboxes.am b/contrib/sboxes/sboxes.am
index d39b58e..61d814f 100644
--- a/contrib/sboxes/sboxes.am
+++ b/contrib/sboxes/sboxes.am
@@ -20,7 +20,6 @@
 sboxes_srcdir = $(top_srcdir)/contrib/sboxes
 sboxes_builddir = $(top_builddir)/contrib/sboxes
 sboxesnotquine = $(sboxes_srcdir)/notquine.sed
-SBOXES_FLAGS = -M$(sboxes_srcdir) -ms -msboxes -Tpdf
 # Files installed in $(tmacdir).
 SBOXES_NORMAL_FILES = contrib/sboxes/sboxes.tmac
 sboxestmacdir = $(tmacdir)
@@ -64,7 +63,7 @@ $(sboxes_builddir)/msboxes.ms: $(SBOXES_EXAMPLEFILES) 
$(sboxesnotquine)
        $(AM_V_GEN)mv $@.tmp $@
 
 $(sboxes_builddir)/msboxes.pdf: $(sboxes_builddir)/msboxes.ms
-       $(AM_V_GEN)$(top_builddir)/test-groff $(SBOXES_FLAGS) \
+       $(GROFF_V)$(DOC_GROFF) -M$(sboxes_srcdir) -ms -msboxes -Tpdf \
          $(sboxes_builddir)/msboxes.ms > $@
 
 uninstall_groffdirs: uninstall_sboxes