gbranden pushed a commit to branch master
in repository groff.
commit d6675ad14d71b4b36b2274b889cd1e2594bfc79c
Author: G. Branden Robinson <[email protected]>
AuthorDate: Sun Jul 19 08:45:20 2026 -0500
Stop using host's soelim(1).
* Makefile.am: Stop using (and relying on) a soelim(1) program in the
host environment; we build what we need. Define macro `SOELIMBIN`.
(.man): Drop prerequisite, which can't portably be used with a suffix
rule. Use the new macro's interpolation, instead of a literal, in the
recipe.
* doc/doc.am ($(GROFF_MAN_PAGES_ALL)): Add dependency-only target
declaring "soelim" as prerequisite.
Fixes build failure in environment lacking an existing *roff
installation. Thanks to Alexis Hildebrandt for the report in
<https://lists.gnu.org/archive/html/groff/2026-07/msg00010.html>.
Continues/corrects commit addb861989, 3 July.
---
ChangeLog | 17 +++++++++++++++++
Makefile.am | 5 +++--
doc/doc.am | 2 ++
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1900f668c..1190fed1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2026-07-19 G. Branden Robinson <[email protected]>
+
+ * Makefile.am: Stop using (and relying on) a soelim(1) program
+ in the host environment; we build what we need. Define macro
+ `SOELIMBIN`.
+ (.man): Drop prerequisite, which can't portably be used with a
+ suffix rule. Use the new macro's interpolation, instead of a
+ literal, in the recipe.
+ * doc/doc.am ($(GROFF_MAN_PAGES_ALL)): Add dependency-only
+ target declaring "soelim" as prerequisite.
+
+ Fixes build failure in environment lacking an existing *roff
+ installation. Thanks to Alexis Hildebrandt for the report in
+ <https://lists.gnu.org/archive/html/groff/2026-07/\
+ msg00010.html>.
+
2026-07-19 G. Branden Robinson <[email protected]>
Use GNU Automake's "maintainer mode" to manage maintainer-mode
@@ -10,6 +26,7 @@
repository).
* doc/doc.am: Add targets produced only in maintainer mode to
the `MAINTAINERCLEANFILES` macro.
+
($(DOC_GNU_EPS)):
($(DOC_GNU_PNG)):
($(DOC_LINE_LAYOUT_EPS)):
diff --git a/Makefile.am b/Makefile.am
index 4ceaae1b1..1690909df 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -496,6 +496,7 @@ endif
GROFFBIN = $(abs_top_builddir)/groff
GROFF_BIN_PATH = $(abs_top_builddir)
PDFMOMBIN = $(abs_top_builddir)/pdfmom
+SOELIMBIN = $(abs_top_builddir)/soelim
# Search for macro files and device/font description directories in
# source _and_ build trees; some of each are generated.
FFLAG=-F$(abs_top_builddir)/font -F$(abs_top_srcdir)/font
@@ -830,7 +831,7 @@ set-man-page-time-stamps:
makevarescape=$(top_srcdir)/makevarescape.sed
SUFFIXES += .man
-.man: soelim
+.man:
$(AM_V_GEN)$(MKDIR_P) `dirname $@` \
&& LC_ALL=C \
sed -e "s|[@]APPDEFDIR[@]|`echo $(appdefdir) | sed -f
$(makevarescape)`|g" \
@@ -865,7 +866,7 @@ SUFFIXES += .man
-e "s|[@]TMAC_MDIR[@]|`echo $(tmacdir) | sed -f
$(makevarescape)`/mm|g" \
-e "s|[@]TMAC_S_PREFIX[@]|\\\\%$(tmac_s_prefix)|g" \
-e "s|[@]VERSION[@]|$(VERSION)|g" \
- $< | soelim -I $(srcdir) -I $(builddir) \
+ $< | $(SOELIMBIN) -I $(srcdir) -I $(builddir) \
>$@
# Version files - see script "build-aux/git-version-gen".
diff --git a/doc/doc.am b/doc/doc.am
index 774e9ab45..9898a19d8 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -271,6 +271,8 @@ GROFF_MAN_PAGES3 = \
GROFF_MAN_PAGES_ALL = $(GROFF_MAN_PAGES1) $(GROFF_MAN_PAGES2) \
$(GROFF_MAN_PAGES3)
+$(GROFF_MAN_PAGES_ALL): soelim
+
# This is a convenience target for (re-)generating all the man pages.
man-all: $(GROFF_MAN_PAGES_ALL)
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
