gbranden pushed a commit to branch master
in repository groff.
commit b6fc65e87ed08e091c7caa73aabe7be0833129aa
Author: G. Branden Robinson <[email protected]>
AuthorDate: Sun Mar 22 14:56:00 2026 -0500
[hdtbl]: Generate `.roff` files from `.roff.in`.
Revise approach to generating fonts*.roff files, employing a technique
that is not endorsed by the POSIX Issue 8 (2024) standard for make(1),
but which GNU and *BSD make programs handle as desired, and consistently
with each other. See <https://cgit.git.savannah.gnu.org/cgit/
groff.git/tree/doc/doc.am?h=1.24.1#n310> for background.
* contrib/hdtbl/examples/fonts_n.in:
* contrib/hdtbl/examples/fonts_x.in: Rename these...
* contrib/hdtbl/examples/fonts_n.roff.in:
* contrib/hdtbl/examples/fonts_x.roff.in: ...to these.
* contrib/hdtbl/hdtbl.am (EXTRA_DIST): Ship files as renamed.
(SUFFIXES): Replace `.roff` and `.in` with `.roff.in`.
(.in.roff): Rename target from this...
(.roff.in.roff): ...to this.
---
contrib/hdtbl/ChangeLog | 18 ++++++++++++++++++
contrib/hdtbl/examples/{fonts_n.in => fonts_n.roff.in} | 0
contrib/hdtbl/examples/{fonts_x.in => fonts_x.roff.in} | 0
contrib/hdtbl/hdtbl.am | 8 ++++----
4 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/contrib/hdtbl/ChangeLog b/contrib/hdtbl/ChangeLog
index 95c13a502..c7c21cd02 100644
--- a/contrib/hdtbl/ChangeLog
+++ b/contrib/hdtbl/ChangeLog
@@ -1,3 +1,21 @@
+2026-03-22 G. Branden Robinson <[email protected]>
+
+ Revise approach to generating fonts*.roff files, employing a
+ technique that is not endorsed by the POSIX Issue 8 (2024)
+ standard for make(1), but which GNU and *BSD make programs
+ handle as desired, and consistently with each other. See
+ <https://cgit.git.savannah.gnu.org/cgit/groff.git/tree/doc/\
+ doc.am?h=1.24.1#n310> for background.
+
+ * examples/fonts_n.in:
+ * examples/fonts_x.in: Rename these...
+ * examples/fonts_n.roff.in:
+ * examples/fonts_x.roff.in: ...to these.
+ * hdtbl.am (EXTRA_DIST): Ship files as renamed.
+ (SUFFIXES): Replace `.roff` and `.in` with `.roff.in`.
+ (.in.roff): Rename target from this...
+ (.roff.in.roff): ...to this.
+
2026-01-21 G. Branden Robinson <[email protected]>
* hdtbl.tmac: Actually skip loading the package if the formatter
diff --git a/contrib/hdtbl/examples/fonts_n.in
b/contrib/hdtbl/examples/fonts_n.roff.in
similarity index 100%
rename from contrib/hdtbl/examples/fonts_n.in
rename to contrib/hdtbl/examples/fonts_n.roff.in
diff --git a/contrib/hdtbl/examples/fonts_x.in
b/contrib/hdtbl/examples/fonts_x.roff.in
similarity index 100%
rename from contrib/hdtbl/examples/fonts_x.in
rename to contrib/hdtbl/examples/fonts_x.roff.in
diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am
index d2bb520d4..1b57a57fd 100644
--- a/contrib/hdtbl/hdtbl.am
+++ b/contrib/hdtbl/hdtbl.am
@@ -52,8 +52,8 @@ HDTBLGENFILES = \
contrib/hdtbl/examples/fonts_n.roff \
contrib/hdtbl/examples/fonts_x.roff
EXTRA_DIST += \
- contrib/hdtbl/examples/fonts_n.in \
- contrib/hdtbl/examples/fonts_x.in \
+ contrib/hdtbl/examples/fonts_n.roff.in \
+ contrib/hdtbl/examples/fonts_x.roff.in \
$(hdtbl_test_template)
$(HDTBLPROCESSEDEXAMPLEFILES): $(DEVPSFONTFILES)
@@ -113,13 +113,13 @@ contrib/hdtbl/examples/test-hdtbl.sh: \
MOSTLYCLEANFILES += $(hdtbl_TESTS)
# Rule to generate ps and roff files
-SUFFIXES += .roff .in .ps
+SUFFIXES += .roff.in .ps
.roff.ps:
$(GROFF_V)$(MKDIR_P) `dirname $@` \
&& $(HDTBLGROFF) -Tps $< >$@
-.in.roff:
+.roff.in.roff:
$(AM_V_GEN)$(MKDIR_P) `dirname $@` \
&& sed -e "s|[@]fontdir[@]|$(fontdir)|" \
-e "s|[@]EGREP[@]|$(EGREP)|" $< >$@
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
