[groff] 01/11: doc/doc.am: Refactor: use RM macro idiomatically.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit c2698aadea505df9a19d78d219169c6ccc91e795
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Wed Apr 6 00:44:05 2022 +1000

    doc/doc.am: Refactor: use RM macro idiomatically.
    
    * doc/doc.am: Trivially refactor.  Use `RM` macro idiomatically.
      Automake ensures that it is defined to call an `rm` command with the
      `-f` option, and this in turn ignores failures to delete nonexistent
      files, so...
    
      (uninstall_doc_examples, uninstall-pdf): Stop adding superfluous `-f`
      flag.
    
      (clean_infodoc uninstall-pdf, uninstall-html): Stop prefixing command
      with `-` to ignore error exit status.
    
      (uninstall-html): Drop superfluous `-r` flag; we're only deleting
      files with this command, not directories.
---
 ChangeLog  | 13 +++++++++++++
 doc/doc.am | 14 +++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9531e17d..5d5c3aaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2022-04-06  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * doc/doc.am: Trivially refactor.  Use `RM` macro idiomatically.
+       Automake ensures that it is defined to call an `rm` command with
+       the `-f` option, and this in turn ignores failures to delete
+       nonexistent files, so...
+       (uninstall_doc_examples, uninstall-pdf): Stop adding superfluous
+       `-f` flag.
+       (clean_infodoc uninstall-pdf, uninstall-html): Stop prefixing
+       command with `-` to ignore error exit status.
+       (uninstall-html): Drop superfluous `-r` flag; we're only
+       deleting files with this command, not directories.
+
 2022-04-05  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * doc/doc.am: Refactor and fix error in builds in remote
diff --git a/doc/doc.am b/doc/doc.am
index 9189a8bb..6ede6294 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -446,7 +446,7 @@ uninstall-hook: \
   uninstall_doc_examples uninstall_doc_htmldoc uninstall_mom
 uninstall_doc_examples:
 if BUILD_EXAMPLES
-       $(RM) -f $(DESTDIR)$(exampledir)/gnu.eps
+       $(RM) $(DESTDIR)$(exampledir)/gnu.eps
 endif
 if BUILD_HTMLEXAMPLES
        -test -d $(DESTDIR)$(docexamplesdir) && \
@@ -609,10 +609,10 @@ install-doc: install-pdf install-html
 distclean-local: clean_infodoc clean_otherdoc
 maintainer-clean-local: clean_infodoc clean_otherdoc
 clean_infodoc:
-       -$(RM) $(doc_builddir)/groff.info*
-       -$(RM) $(doc_builddir)/groff.pdf
-       -$(RM) $(doc_builddir)/groff.dvi
-       -$(RM) -r $(doc_builddir)/groff.html.*
+       $(RM) $(doc_builddir)/groff.info*
+       $(RM) $(doc_builddir)/groff.pdf
+       $(RM) $(doc_builddir)/groff.dvi
+       $(RM) -r $(doc_builddir)/groff.html.*
 clean_otherdoc:
        -cd $(doc_builddir) && \
          $(RM) -r *.pdf *.html *.txt *.dvi *.t2p *.t2d
@@ -652,9 +652,9 @@ uninstall_infodoc:
          $(RM) $$f; \
        done
 uninstall-pdf:
-       -$(RM) -f $(DESTDIR)$(pdfdocdir)/groff.pdf
+       $(RM) $(DESTDIR)$(pdfdocdir)/groff.pdf
 uninstall-html:
-       -$(RM) -r $(DESTDIR)$(htmldocdir)/groff.html.*
+       $(RM) $(DESTDIR)$(htmldocdir)/groff.html.*
 
 # An image of a gnu in enscapsulated PostScript is generated during the
 # build process if possible.