summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorG. Branden Robinson <g.branden.robinson@gmail.com>2023-02-22 18:49:04 -0600
committerG. Branden Robinson <g.branden.robinson@gmail.com>2023-02-22 20:28:13 -0600
commit803ad5f7b341fe39cc471fbbcedccd0161503736 (patch)
treea262ee443e70637d4f10a9c8202ab40d923b8492
parent691fc701089875239485dd9e3e80d0735a4fd5e2 (diff)
downloadgroff-git-803ad5f7b341fe39cc471fbbcedccd0161503736.tar.gz
[doc]: Uninstall groff Texinfo in HTML better.
* Makefile.am (uninstall_groffdirs): Remove "html.mono" and "html.node" directories corresponding to HTML version of our Texinfo manual. * doc/doc.am (uninstall-html): Uninstall HTML version of our Texinfo manual more reliably.
-rw-r--r--ChangeLog8
-rw-r--r--Makefile.am6
-rw-r--r--doc/doc.am3
3 files changed, 16 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 185d902d7..931717f64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2023-02-22 G. Branden Robinson <g.branden.robinson@gmail.com>
+ * Makefile.am (uninstall_groffdirs): Remove "html.mono" and
+ "html.node" directories corresponding to HTML version of our
+ Texinfo manual.
+ * doc/doc.am (uninstall-html): Uninstall HTML version of our
+ Texinfo manual more reliably.
+
+2023-02-22 G. Branden Robinson <g.branden.robinson@gmail.com>
+
[doc]: Handle output formats of our Texinfo manual more
consistently.
diff --git a/Makefile.am b/Makefile.am
index 0a37778cc..a5d8907f4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -774,6 +774,12 @@ uninstall_groffdirs:
rmdir $(DESTDIR)$(exampledir); \
fi; \
if test -d $(DESTDIR)$(htmldocdir); then \
+ if test -d $(DESTDIR)$(htmldocdir)/groff.html.mono; then \
+ rmdir $(DESTDIR)$(htmldocdir)/groff.html.mono; \
+ fi; \
+ if test -d $(DESTDIR)$(htmldocdir)/groff.html.node; then \
+ rmdir $(DESTDIR)$(htmldocdir)/groff.html.node; \
+ fi; \
rmdir $(DESTDIR)$(htmldocdir); \
fi; \
rmdir $(DESTDIR)$(docdir); \
diff --git a/doc/doc.am b/doc/doc.am
index e7733d147..cddc51907 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -665,7 +665,8 @@ uninstall-pdf:
$(RM) $(DESTDIR)$(pdfdocdir)/groff.pdf
-rmdir $(DESTDIR)$(pdfdocdir)
uninstall-html:
- $(RM) $(DESTDIR)$(htmldocdir)/groff.html.*
+ $(RM) $(DESTDIR)$(htmldocdir)/groff.html.mono/*
+ $(RM) $(DESTDIR)$(htmldocdir)/groff.html.node/*
uninstall-txt:
$(RM) $(DESTDIR)$(docdir)/groff.txt