gbranden pushed a commit to branch master
in repository groff.
commit 4635798b0a6058301768956eff0d6c149c45dda5
Author: G. Branden Robinson <[email protected]>
AuthorDate: Mon May 11 01:25:04 2026 -0500
[gxditview]: Fix racy install.
* src/devices/xditview/xditview.am: Fix race when running "install" Make
target with concurrency. This Automake file was duplicatively
claiming responsibility for installing the "tty.tmac" and
"tty-char.tmac" files, which are properly within _grotty_'s demense
exclusively. Drop definitions of `GXDITVIEWTMACFILES`,
`gxditviewtmacdir`, and `dist_gxditviewtmac_DATA` macros.
(uninstall_xditview): Drop now superfluous rmdir(1) from recipe.
Fixes <https://savannah.gnu.org/bugs/?68336>. Thanks to Santiago Vila
for the report and analysis. Problem introduced by me in commit
8910c63b6d, 2024-12-10.
ANNOUNCE: Acknowledge Santiago.
---
ANNOUNCE | 1 +
ChangeLog | 15 +++++++++++++++
src/devices/xditview/xditview.am | 7 -------
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/ANNOUNCE b/ANNOUNCE
index 7cbf5e854..684017671 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -220,4 +220,5 @@ Karl Berry
Morten Bo Johansen
Richard Purdie
Russ Allbery
+Santiago Vila
Zack Weinberg
diff --git a/ChangeLog b/ChangeLog
index bb85c6ead..e1cf6c4d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2026-05-09 G. Branden Robinson <[email protected]>
+
+ * src/devices/xditview/xditview.am: Fix race when running
+ "install" Make target with concurrency. This Automake file was
+ duplicatively claiming responsibility for installing the
+ "tty.tmac" and "tty-char.tmac" files, which are properly within
+ _grotty_'s demense exclusively. Drop definitions of
+ `GXDITVIEWTMACFILES`, `gxditviewtmacdir`, and
+ `dist_gxditviewtmac_DATA` macros.
+ (uninstall_xditview): Drop now superfluous rmdir(1) from recipe.
+
+ Fixes <https://savannah.gnu.org/bugs/?68336>. Thanks to
+ Santiago Vila for the report and analysis. Problem introduced
+ by me in commit 8910c63b6d, 2024-12-10.
+
2026-05-09 G. Branden Robinson <[email protected]>
* src/devices/grohtml/html-text.cpp: Fix code style nits.
diff --git a/src/devices/xditview/xditview.am b/src/devices/xditview/xditview.am
index 1f51d91d0..421b825be 100644
--- a/src/devices/xditview/xditview.am
+++ b/src/devices/xditview/xditview.am
@@ -59,12 +59,6 @@ gxditview_SOURCES = $(GXDITVIEWSOURCES)
nodist_gxditview_SOURCES = $(XDITVIEW_GENHDRS)
CLEANFILES += $(XDITVIEW_GENHDRS)
-GXDITVIEWTMACFILES = \
- tmac/tty.tmac \
- tmac/tty-char.tmac
-gxditviewtmacdir = $(tmacdir)
-dist_gxditviewtmac_DATA = $(GXDITVIEWTMACFILES)
-
man1_MANS += $(GXDITVIEW_MAN1)
# Because we defined gxditview_CPPFLAGS, automake renames all of
@@ -126,7 +120,6 @@ uninstall_xditview:
$(RM) $(DESTDIR)$(appdefdir)/GXditview-color
$(RM) $(DESTDIR)$(fontdir)/FontMap-X11
-rmdir $(DESTDIR)$(fontdir) 2>/dev/null
- -rmdir $(DESTDIR)$(tmacdir) 2>/dev/null
endif
# Local Variables:
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
