[groff] 01/01: [sboxes] fix non-portable syntax in the msboxes.pdf target

[Ingo Schwarze]

schwarze pushed a commit to branch master
in repository groff.

commit 32f057cab219de1f44e91aa38436e81ac77a6ae6
Author: Ingo Schwarze <schwarze@openbsd.org>
AuthorDate: Tue Mar 22 15:08:50 2022 +0100

    [sboxes] fix non-portable syntax in the msboxes.pdf target
    
    The DOC_GROFF facility uses the $< variable which POSIX only defines
    for use in suffix rules, but the msboxes.pdf rule is not a suffix rule
    and uses it anyway.  Besides, the whole point of DOC_GROFF is to
    manipulate standard input, but then providing a file name argument
    afterwards causes groff to discard the modified input.
    
    Branden pointed out that we do not want a .ms.pdf suffix rule here
    because the particular command is very specialized and other future
    conversions from .ms to .pdf are unlikely to need -msboxes but
    likely to need other macros or preprocessors.  So this commit uses
    my alternative solution of simply using DOC_GROFF_ONLY in place of
    DOC_GROFF.
    
    Feedback and OK from gbranden@.
---
 contrib/sboxes/ChangeLog | 7 +++++++
 contrib/sboxes/sboxes.am | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/contrib/sboxes/ChangeLog b/contrib/sboxes/ChangeLog
index 98893d1c..637901dd 100644
--- a/contrib/sboxes/ChangeLog
+++ b/contrib/sboxes/ChangeLog
@@ -1,3 +1,10 @@
+2022-03-22  Ingo Schwarze <schwarze@openbsd.org>
+
+       * sboxes.am: fix non-portable syntax in the msboxes.pdf target
+       by using DOC_GROFF_ONLY rather than DOC_GROFF in order to not
+       use $< outside a suffix rule; DOC_GROFF functionality is not
+       needed here in the first place.
+
 2022-03-22  Ingo Schwarze <schwarze@openbsd.org>
 
        * sboxes.am: make the build of msboxes.{ms,pdf} work with BSD
diff --git a/contrib/sboxes/sboxes.am b/contrib/sboxes/sboxes.am
index c4c0af2f..8eaf3a69 100644
--- a/contrib/sboxes/sboxes.am
+++ b/contrib/sboxes/sboxes.am
@@ -63,7 +63,7 @@ $(sboxes_builddir)/msboxes.ms: $(SBOXES_EXAMPLEFILES) 
$(sboxesnotquine)
        $(AM_V_GEN)mv $@.tmp $@
 
 $(sboxes_builddir)/msboxes.pdf: $(sboxes_builddir)/msboxes.ms
-       $(GROFF_V)$(DOC_GROFF) -M$(sboxes_srcdir) -ms -msboxes -Tpdf \
+       $(GROFF_V)$(DOC_GROFF_ONLY) -M$(sboxes_srcdir) -ms -msboxes -Tpdf \
          $(sboxes_builddir)/msboxes.ms > $@
 
 uninstall_groffdirs: uninstall_sboxes