From dd3fb0f8c1c10fcee804f11a4eed84316c5f694b Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Sat, 18 Oct 2003 10:20:59 +0000
Subject: Peter Kjellerstedt writes:

rm.patch:
* Define $(RM) as rm -f in Rules.mak and test/Rules.mak
  (this is the same definition as gmake uses by default).
* Change all occurrences of rm and rm -f into $(RM).
---
 extra/Makefile            |  2 +-
 extra/config/Makefile     |  6 +++---
 extra/gcc-uClibc/Makefile |  2 +-
 extra/locale/Makefile     | 10 +++++-----
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'extra')

diff --git a/extra/Makefile b/extra/Makefile
index 4dd33b5d2..899dda423 100644
--- a/extra/Makefile
+++ b/extra/Makefile
@@ -35,7 +35,7 @@ tags:
 	ctags -R
 
 clean: subdirs_clean
-	rm -f *.[oa] *~ core
+	$(RM) *.[oa] *~ core
 
 subdirs: $(patsubst %, _dir_%, $(DIRS))
 subdirs_clean: $(patsubst %, _dirclean_%, $(DIRS) $(EXTRA_DIRS_TO_CLEAN))
diff --git a/extra/config/Makefile b/extra/config/Makefile
index e56ab7d01..822a483bc 100644
--- a/extra/config/Makefile
+++ b/extra/config/Makefile
@@ -103,9 +103,9 @@ endif
 ncurses:
 	@echo "main() {}" > lxtemp.c
 	@if $(HOSTCC) lxtemp.c $(LIBS) ; then \
-		rm -f lxtemp.c a.out; \
+		$(RM) lxtemp.c a.out; \
 	else \
-		rm -f lxtemp.c; \
+		$(RM) lxtemp.c; \
 		echo -e "\007" ;\
 		echo ">> Unable to find the Ncurses libraries." ;\
 		echo ">>" ;\
@@ -119,6 +119,6 @@ ncurses:
 	fi
 
 clean:
-	rm -f *.o *~ core $(TARGETS) $(MCONF_OBJS) $(CONF_OBJS) \
+	$(RM) *.o *~ core $(TARGETS) $(MCONF_OBJS) $(CONF_OBJS) \
 		conf mconf zconf.tab.c zconf.tab.h lex.zconf.c lkc_defs.h
 
diff --git a/extra/gcc-uClibc/Makefile b/extra/gcc-uClibc/Makefile
index a37455626..bbe17cc99 100644
--- a/extra/gcc-uClibc/Makefile
+++ b/extra/gcc-uClibc/Makefile
@@ -85,4 +85,4 @@ endif
 	done
 
 clean:
-	rm -f gcc-uClibc.h *-uclibc-gcc *-uclibc-ld core
+	$(RM) gcc-uClibc.h *-uclibc-gcc *-uclibc-ld core
diff --git a/extra/locale/Makefile b/extra/locale/Makefile
index eed345d76..2d8a147e8 100644
--- a/extra/locale/Makefile
+++ b/extra/locale/Makefile
@@ -86,10 +86,10 @@ pregen:
 	cat uClibc_locale_data.h | awk 'BEGIN{i=1}{ if ( /WANT_/ ) i = /endif/ ; else if (i) print $0 }' > ../../include/bits/uClibc_locale_data.h
 
 clean:
-	rm -f *.[oa] *~ core
-	rm -f gen_wc8bit gen_wctype gen_locale gen_ldc gen_collate
-	rm -f c8tables.h wctables.h locale_tables.h lt_defines.h locale_collate.h
-	rm -f gen_mmap locale.mmap lmmtolso
-	rm -f locale_data.c uClibc_locale_data.h
+	$(RM) *.[oa] *~ core
+	$(RM) gen_wc8bit gen_wctype gen_locale gen_ldc gen_collate
+	$(RM) c8tables.h wctables.h locale_tables.h lt_defines.h locale_collate.h
+	$(RM) gen_mmap locale.mmap lmmtolso
+	$(RM) locale_data.c uClibc_locale_data.h
 
 .PHONY: pregen links-target
-- 
cgit v1.2.3