[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 23/23: [build]: Prefer `$(RM)` to `rm -f` literal.
|
From: |
G. Branden Robinson |
|
Subject: |
[groff] 23/23: [build]: Prefer `$(RM)` to `rm -f` literal. |
|
Date: |
Sun, 13 Aug 2023 18:35:11 -0400 (EDT) |
gbranden pushed a commit to branch master
in repository groff.
commit 6179d90c5500dc5d71a20456dacd86551e0b28da
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sat Aug 12 01:07:58 2023 -0500
[build]: Prefer `$(RM)` to `rm -f` literal.
Our "Makefile.am" defines an `RM` macro if make(1) itself does not, and
our Automake files employ it extensively; sweep up the stragglers.
* font/devpdf/devpdf.am (mostlyclean_devpdf_extra, uninstall_devpdf):
* src/libs/libgroff/libgroff.am (install_charset_data):
* src/roff/nroff/nroff.am (nroff):
* src/utils/indxbib/indxbib.am (install_indxbib, uninstall_indxbib):
Do it.
---
ChangeLog | 13 +++++++++++++
font/devpdf/devpdf.am | 6 +++---
src/devices/xditview/xditview.am | 6 +++---
src/libs/libgroff/libgroff.am | 8 ++++----
src/roff/nroff/nroff.am | 2 +-
src/utils/indxbib/indxbib.am | 6 +++---
6 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 65c6de7d9..5a5744bb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2023-08-12 G. Branden Robinson <g.branden.robinson@gmail.com>
+
+ Our "Makefile.am" defines an `RM` macro if make(1) itself does
+ not, and our Automake files employ it extensively; sweep up the
+ stragglers.
+
+ * font/devpdf/devpdf.am (mostlyclean_devpdf_extra)
+ (uninstall_devpdf):
+ * src/libs/libgroff/libgroff.am (install_charset_data):
+ * src/roff/nroff/nroff.am (nroff):
+ * src/utils/indxbib/indxbib.am (install_indxbib):
+ (uninstall_indxbib): Do it.
+
2023-08-12 G. Branden Robinson <g.branden.robinson@gmail.com>
* src/utils/indxbib/indxbib.am (install_indxbib): Use `$(LN_S)`,
diff --git a/font/devpdf/devpdf.am b/font/devpdf/devpdf.am
index edce36575..cfe237f36 100644
--- a/font/devpdf/devpdf.am
+++ b/font/devpdf/devpdf.am
@@ -140,7 +140,7 @@ mostlyclean_devpdf_extra:
$(top_builddir)/font/devpdf/map;
if test -d $(top_builddir)/font/devpdf; then \
for f in $(GROFF_FONT_FILES); do \
- rm -f $(top_builddir)/font/devpdf/$$f; \
+ $(RM) $(top_builddir)/font/devpdf/$$f; \
done; \
fi
@@ -166,7 +166,7 @@ uninstall_devpdf:
@echo Uninstalling devpdf files
if test -d $(DESTDIR)$(devpdffontdir); then \
for f in $(GROFF_FONT_FILES); do \
- rm -f $(DESTDIR)$(devpdffontdir)/$$f; \
+ $(RM) $(DESTDIR)$(devpdffontdir)/$$f; \
done; \
if test -d $(DESTDIR)$(devpdffontencdir); then \
rmdir $(DESTDIR)$(devpdffontencdir); \
@@ -174,7 +174,7 @@ uninstall_devpdf:
if test -d $(DESTDIR)$(devpdffontmapdir); then \
rmdir $(DESTDIR)$(devpdffontmapdir); \
fi; \
- rm -f $(DESTDIR)$(devpdffontdir)/download; \
+ $(RM) $(DESTDIR)$(devpdffontdir)/download; \
rmdir $(DESTDIR)$(devpdffontdir); \
fi
diff --git a/src/devices/xditview/xditview.am b/src/devices/xditview/xditview.am
index 95bd91ead..e0a2c3e43 100644
--- a/src/devices/xditview/xditview.am
+++ b/src/devices/xditview/xditview.am
@@ -115,9 +115,9 @@ install_xditview: \
$(DESTDIR)$(appdefdir)/GXditview-color
uninstall_xditview:
- rm -f $(DESTDIR)$(appdefdir)/GXditview
- rm -f $(DESTDIR)$(appdefdir)/GXditview-color
- rm -f $(DESTDIR)$(fontdir)/FontMap-X11
+ $(RM) $(DESTDIR)$(appdefdir)/GXditview
+ $(RM) $(DESTDIR)$(appdefdir)/GXditview-color
+ $(RM) $(DESTDIR)$(fontdir)/FontMap-X11
-rmdir $(DESTDIR)$(fontdir) 2>/dev/null
endif
diff --git a/src/libs/libgroff/libgroff.am b/src/libs/libgroff/libgroff.am
index be6d9e260..8dbccecd4 100644
--- a/src/libs/libgroff/libgroff.am
+++ b/src/libs/libgroff/libgroff.am
@@ -148,14 +148,14 @@ install_charset_data:
> $(DESTDIR)$(libdir)/t-charset.alias; \
$(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias \
$(DESTDIR)$(libdir)/charset.alias; \
- rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
+ $(RM) $(DESTDIR)$(libdir)/t-charset.alias; \
else \
if test $(GLIBC21) = no; then \
sed -f ref-add.sed charset.alias \
> $(DESTDIR)$(libdir)/t-charset.alias; \
$(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias \
$(DESTDIR)$(libdir)/charset.alias; \
- rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
+ $(RM) $(DESTDIR)$(libdir)/t-charset.alias; \
fi; \
fi
@@ -166,12 +166,12 @@ uninstall_charset_data:
> $(DESTDIR)$(libdir)/t-charset.alias; \
if grep '^# Packages using this file: $$' \
$(DESTDIR)$(libdir)/t-charset.alias > /dev/null; then \
- rm -f $(DESTDIR)$(libdir)/charset.alias; \
+ $(RM) $(DESTDIR)$(libdir)/charset.alias; \
else \
$(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias \
$(DESTDIR)$(libdir)/charset.alias; \
fi; \
- rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
+ $(RM) $(DESTDIR)$(libdir)/t-charset.alias; \
fi
diff --git a/src/roff/nroff/nroff.am b/src/roff/nroff/nroff.am
index 82738d9ae..3e858794f 100644
--- a/src/roff/nroff/nroff.am
+++ b/src/roff/nroff/nroff.am
@@ -28,7 +28,7 @@ TESTS += $(nroff_TESTS)
EXTRA_DIST += $(nroff_TESTS)
nroff: $(nroff_srcdir)/nroff.sh $(SH_DEPS_SED_SCRIPT)
- $(AM_V_GEN)rm -f $@ \
+ $(AM_V_GEN)$(RM) $@ \
&& sed -f $(SH_DEPS_SED_SCRIPT) \
-e $(SH_SCRIPT_SED_CMD) \
-e "s|[@]VERSION[@]|$(VERSION)|" \
diff --git a/src/utils/indxbib/indxbib.am b/src/utils/indxbib/indxbib.am
index 34973b653..1154bb024 100644
--- a/src/utils/indxbib/indxbib.am
+++ b/src/utils/indxbib/indxbib.am
@@ -36,18 +36,18 @@ install_indxbib: $(indxbib_srcdir)/eign
-test -d $(DESTDIR)$(datasubdir) \
|| $(mkinstalldirs) $(DESTDIR)$(datasubdir)
if test -f /usr/lib/eign; then \
- rm -f $(DESTDIR)$(common_words_file); \
+ $(RM) $(DESTDIR)$(common_words_file); \
$(LN_S) /usr/lib/eign $(DESTDIR)$(common_words_file) 2>/dev/null \
|| ln /usr/lib/eign $(DESTDIR)$(common_words_file) 2>/dev/null \
|| cp /usr/lib/eign $(DESTDIR)$(common_words_file); \
else \
- rm -f $(DESTDIR)$(common_words_file); \
+ $(RM) $(DESTDIR)$(common_words_file); \
$(INSTALL_DATA) $(indxbib_srcdir)/eign
$(DESTDIR)$(common_words_file); \
fi
uninstall-local: uninstall_indxbib
uninstall_indxbib:
- rm -f $(DESTDIR)$(common_words_file)
+ $(RM) $(DESTDIR)$(common_words_file)
# Local Variables:
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 23/23: [build]: Prefer `$(RM)` to `rm -f` literal.,
G. Branden Robinson <=