[build]: Uninstall more fastidiously.

Try to remove the configured PDF documentation directory in the event it
is empty, but do not fail if it isn't.  (It can be a directory shared
with other groff components; we don't know in what order the uninstall
targets will serialize, but the last one run should succeed.)

* contrib/mom/mom.am (uninstall_mom):
* contrib/pdfmark/pdfmark.am (uninstall-pdfmark-hook):
* contrib/sboxes/sboxes.am (uninstall_sboxes):
* doc/doc.am (uninstall-pdf): Do it.

6 files changed, 31 insertions, 3 deletions

diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 6fd29d2ff..14b6d15a6 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,11 @@
+2023-02-18  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+	* mom.am (uninstall_mom): Clean more fastidiously; try to remove
+	the configured `pdfdocdir` in the event it is empty, but do not
+	fail if it isn't.  (It can be a directory shared with other
+	groff components; we don't know in what order the uninstall
+	targets will serialize, but the last one run should succeed.)
+
 2023-02-02
 	* om.tmac (UNDERSCORE, UNDERSCORE2): Add PREFIX and SUFFIX
 	arguments so surrounding punctuation can be protected from
diff --git a/contrib/mom/mom.am b/contrib/mom/mom.am
index 366ba8e27..461203457 100644
--- a/contrib/mom/mom.am
+++ b/contrib/mom/mom.am
@@ -168,6 +168,7 @@ uninstall_mom:
 	for f in $(PDFDOCFILE); do \
 	  $(RM) $(DESTDIR)$(pdfdocdir)/$$f; \
 	done
+	-rmdir $(DESTDIR)$(pdfdocdir)
 	if test -d $(DESTDIR)$(exampledir)/mom; then \
 	  rmdir $(DESTDIR)$(exampledir)/mom; \
 	fi
diff --git a/contrib/pdfmark/ChangeLog b/contrib/pdfmark/ChangeLog
index a50f5b143..1c5a18f50 100644
--- a/contrib/pdfmark/ChangeLog
+++ b/contrib/pdfmark/ChangeLog
@@ -1,3 +1,12 @@
+2023-02-18  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+	* pdfmark.am (uninstall-pdfmark-hook): Simplify uninstallation.
+	Try to remove the configured `pdfdocdir` in the event it is
+	empty, but do not fail if it isn't.  (It can be a directory
+	shared with other groff components; we don't know in what order
+	the uninstall targets will serialize, but the last one run
+	should succeed.)
+
 2022-09-20  G. Branden Robinson <g.branden.robinson@gmail.com>
 
 	* sanitize.tmac: Move comment to where escape sequences are
diff --git a/contrib/pdfmark/pdfmark.am b/contrib/pdfmark/pdfmark.am
index 9589a8bc3..15eec8c67 100644
--- a/contrib/pdfmark/pdfmark.am
+++ b/contrib/pdfmark/pdfmark.am
@@ -88,9 +88,7 @@ mostlyclean_pdfmark:
 uninstall_groffdirs: uninstall-pdfmark-hook
 uninstall-pdfmark-hook:
 if USE_PDFROFF
-	if test -d $(DESTDIR)$(pdfmarkpdfdocdir); then \
-	  rmdir $(DESTDIR)$(pdfmarkpdfdocdir); \
-	fi
+	-rmdir $(DESTDIR)$(pdfmarkpdfdocdir)
 endif
 
 
diff --git a/contrib/sboxes/ChangeLog b/contrib/sboxes/ChangeLog
index 0fd7e0ada..4d569842d 100644
--- a/contrib/sboxes/ChangeLog
+++ b/contrib/sboxes/ChangeLog
@@ -1,3 +1,12 @@
+2023-02-18  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+	* sboxes.am (uninstall_sboxes): Clean more fastidiously; try to
+	remove the configured `sboxespdfdocdir` in the event it is
+	empty, but do not fail if it isn't.  (It can be a directory
+	shared with other groff components; we don't know in what order
+	the uninstall targets will serialize, but the last one run
+	should succeed.)
+
 2022-10-23  G. Branden Robinson <g.branden.robinson@gmail.com>
 
 	* sboxes.tmac: Escape newline after opening conditional block.
diff --git a/contrib/sboxes/sboxes.am b/contrib/sboxes/sboxes.am
index cbab2a479..7786337d9 100644
--- a/contrib/sboxes/sboxes.am
+++ b/contrib/sboxes/sboxes.am
@@ -63,6 +63,9 @@ uninstall_sboxes:
 	if test -d $(DESTDIR)$(exampledir)/sboxes; then \
 	  rmdir $(DESTDIR)$(exampledir)/sboxes; \
 	fi
+if USE_GROPDF
+	-rmdir $(DESTDIR)$(sboxespdfdocdir)
+endif
 
 # Local Variables:
 # fill-column: 72