gbranden pushed a commit to branch master
in repository groff.
commit 03d2cc83679496d37f39abdd98714f1c583fb7dc
Author: G. Branden Robinson <[email protected]>
AuthorDate: Thu Oct 8 04:25:02 2026 -0500
tmac/tmac.am: Add kludge for Solaris 11 make.
* tmac/tmac.am ($(M4CHECK)): Revise recipe to work with what seems to be
an older, more primitive Make. This seems to be the only hack
required to build groff with the Solaris 11 /usr/bin/make. Therefore
I feel okay supporting it on a probationary basis of minimal tolerance
for shenanigans.
---
ChangeLog | 8 ++++++++
tmac/tmac.am | 15 ++++++++++++---
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 26f031974..421e7e29c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2026-10-08 G. Branden Robinson <[email protected]>
+
+ * tmac/tmac.am ($(M4CHECK)): Revise recipe to work with what
+ seems to be an older, more primitive Make. This seems to be the
+ only hack required to build groff with the Solaris 11
+ /usr/bin/make. Therefore I feel okay supporting it on a
+ probationary basis of minimal tolerance for shenanigans.
+
2026-10-08 G. Branden Robinson <[email protected]>
* man/man.am (man/groff.7.man): Try _again_ to fix
diff --git a/tmac/tmac.am b/tmac/tmac.am
index fbd7c2a4e..1cb5ed96b 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -284,11 +284,20 @@ tmac/www.tmac: tmac/www.tmac.in
M4WORDS = define|divert|include|index|shift|undefine|undivert
M4CHECK = tmac/groff_man-passed-check-for-m4-keywords-stamp
+# TODO: Restore the following recipe technique when we no longer support
+# Solaris make(1).
+# && !$(EGREP) \
+# '(^|[[:space:]])($(M4WORDS))($$|[[:space:]])' \
+# $(tmac_srcdir)/groff_man.7.man.in > $@
$(M4CHECK): tmac/groff_man.7.man.in
- $(AM_V_at)$(MKDIR_P) $(top_builddir)/tmac
- $(AM_V_at)! $(EGREP) \
+ $(AM_V_at)$(MKDIR_P) $(top_builddir)/tmac \
+ && if $(EGREP) \
'(^|[[:space:]])($(M4WORDS))($$|[[:space:]])' \
- $(tmac_srcdir)/groff_man.7.man.in > $@
+ $(tmac_srcdir)/groff_man.7.man.in > $@; then \
+ false; \
+ else \
+ true; \
+ fi
tmac/groff_man.7.man: tmac/groff_man.7.man.in $(M4CHECK)
$(AM_V_GEN)$(M4) -D_groff_man_not_style \
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
