From 803ad5f7b341fe39cc471fbbcedccd0161503736 Mon Sep 17 00:00:00 2001 From: "G. Branden Robinson" Date: Wed, 22 Feb 2023 18:49:04 -0600 Subject: [PATCH] [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. --- ChangeLog | 8 ++++++++ Makefile.am | 6 ++++++ doc/doc.am | 3 ++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 185d902d7..931717f64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2023-02-22 G. Branden Robinson + + * 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 [doc]: Handle output formats of our Texinfo manual more 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