From: Ben Pfaff <blp@gnu.org>
Date: Sat, 10 Oct 2009 21:35:55 +0000 (-0700)
Subject: Avoid GNU make extension $(RM) in makefiles.
X-Git-Tag: lenny-x64-build41~8
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=553dd6fd34f6ac129d51cf4736f89e349b97e16c;p=pspp-builds.git

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 819df652..ef9acc37 100644
--- 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 95493a7d..a36081c4 100644
--- 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 cd7dba9a..19e5bdd6 100644
--- 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 7fb70931..0e13a387 100644
--- 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