[groff] 29/30: [hdtbl]: Gather groff(1) options together.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit bb7d7cc229dfcdc1f307b79f625e15d6c936f79b
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Thu Oct 10 18:13:32 2024 -0500

    [hdtbl]: Gather groff(1) options together.
    
    * contrib/hdtbl/hdtbl.am (.roff.ps): Move `-I`, `-d`, and `-m` groff
      options from this inference rule...
    
      (HDTBLGROFF): ...to this macro definition.
---
 contrib/hdtbl/ChangeLog |  6 ++++++
 contrib/hdtbl/hdtbl.am  | 13 +++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/contrib/hdtbl/ChangeLog b/contrib/hdtbl/ChangeLog
index a0a1e8d2f..edae8a77c 100644
--- a/contrib/hdtbl/ChangeLog
+++ b/contrib/hdtbl/ChangeLog
@@ -1,3 +1,9 @@
+2024-10-10  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * hdtbl.am (.roff.ps): Move `-I`, `-d`, and `-m` groff options
+       from this inference rule...
+       (HDTBLGROFF): ...to this macro definition.
+
 2022-06-21  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * hdtbl.am (HDTBLPROCESSEDEXAMPLEFILES): Add dependency on
diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am
index 3dd60cf31..b6c334c18 100644
--- a/contrib/hdtbl/hdtbl.am
+++ b/contrib/hdtbl/hdtbl.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2024 Free Software Foundation, Inc.
 #      Written by Werner Lemberg <wl@gnu.org>
 #      Automake migration by Bertrand Garrigues
 #        <bertrand.garrigues@laposte.net>
@@ -26,7 +26,11 @@ man7_MANS += contrib/hdtbl/groff_hdtbl.7
 HDTBLGROFF = \
   GROFF_COMMAND_PREFIX= \
   GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
-  $(GROFFBIN) $(FFLAG) $(MFLAG) -M$(hdtbl_srcdir) -t -p -e -U
+  $(GROFFBIN) $(FFLAG) \
+    -dfontpath=$(top_srcdir)/font \
+    -dsopath=$(hdtbl_srcdir)/ \
+    -I $(doc_builddir) -I $(doc_srcdir) \
+     $(MFLAG) -M$(hdtbl_srcdir) -mhdtbl -t -p -e -U
 
 HDTBLTMACFILES = \
   contrib/hdtbl/hdtbl.tmac \
@@ -108,10 +112,7 @@ SUFFIXES += .roff .in .ps
 
 .roff.ps:
        $(GROFF_V)$(MKDIR_P) `dirname $@` \
-       && $(HDTBLGROFF) -I $(doc_builddir) -I $(doc_srcdir) -Tps \
-            -dfontpath=$(top_srcdir)/font \
-            -dsopath=$(hdtbl_srcdir)/ \
-            -mhdtbl $< >$@
+       && $(HDTBLGROFF) -Tps $< >$@
 
 .in.roff:
        $(AM_V_GEN)$(MKDIR_P) `dirname $@` \