Avoid GNU make extension $(RM) in makefiles.

Automake uses "rm -f" literally so there is not much point in PSPP trying
to use $(RM).  At any rate it's a GNU make extension so it's best to avoid
it for portability.

diff --git a/perl-module/automake.mk b/perl-module/automake.mk
index 819df652dc7d9bff07cf8696b7dd022463291f6c..ef9acc3790c8bc93e13b44dc89c3fcecc46cf3b3 100644 (file)
--- a/perl-module/automake.mk
+++ b/perl-module/automake.mk
@@ -27,7 +27,7 @@ perl-module/Makefile: perl-module/Makefile.PL perl-module/pspp-module-config
        cd perl-module && $(PERL) Makefile.PL PREFIX=$(prefix)
 
 perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz: $(module_sources)
-       $(RM) $@
+       rm -f $@
        cd perl-module && $(MAKE) $(AM_MAKEFLAGS) tardist
 
 PHONY += module-make
@@ -57,9 +57,9 @@ check-local:
 perl_module_CLEAN:
        cd perl-module && $(MAKE) $(AM_MAKEFLAGS) clean || true
        if test x"$(top_builddir)" != x"$(top_srcdir)" ; then \
-         $(RM) $(module_sources) ; \
+         rm -f $(module_sources) ; \
        fi
-       $(RM) perl-module/Makefile.old
+       rm -f perl-module/Makefile.old
 
 CLEAN_LOCAL += perl_module_CLEAN
 

diff --git a/po/automake.mk b/po/automake.mk
index 95493a7d526fda28f8a235ae56a9fc6ed4cc6c99..a36081c433f4a70091e48c08c7ee656024cab3c7 100644 (file)
--- a/po/automake.mk
+++ b/po/automake.mk
@@ -46,7 +46,7 @@ install-data-hook: $(GMOFILES)
 uninstall-hook:
        for f in $(GMOFILES); do \
          lang=`echo $$f | sed -e 's%po/\(.*\)\.gmo%\1%' ` ; \
-         $(RM) $(DESTDIR)$(prefix)/share/locale/$$lang/LC_MESSAGES/$(DOMAIN).mo ; \
+         rm -f $(DESTDIR)$(prefix)/share/locale/$$lang/LC_MESSAGES/$(DOMAIN).mo ; \
        done
 
 

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index cd7dba9ab1eaef610446820c02485b216c9bfdaf..19e5bdd68d5fb5ff3341da09665cd3512bf2f8aa 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -46,7 +46,7 @@ INSTALL_DATA_HOOKS += install-icons
 
 uninstall-icons:
        for size in 16x16 ; do \
-          $(RM) $(themedir)/$$size/$(context)/psppicon.png ; \
+          rm -f $(themedir)/$$size/$(context)/psppicon.png ; \
        done 
        gtk-update-icon-cache --ignore-theme-index $(themedir)
 

diff --git a/tests/automake.mk b/tests/automake.mk
index 7fb70931514f518b375a46a7523d3fa76fc1cfa1..0e13a3877e798287797c6f43c0816f9b48c571d2 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -212,7 +212,7 @@ tests_data_datasheet_test_CFLAGS = $(AM_CFLAGS)
 # This seems to be necessary as the libtool artifacts aren't removed
 # Automake bug ?
 tests_data_datasheet_test_CLEAN:
-       $(RM) -r tests/data
+       rm -fr tests/data
 
 CLEAN_LOCAL += tests_data_datasheet_test_CLEAN