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).

26 files changed, 26 insertions, 26 deletions

diff --git a/libc/misc/Makefile b/libc/misc/Makefile
index f35337a3b..da7c44fba 100644
--- a/libc/misc/Makefile
+++ b/libc/misc/Makefile
@@ -58,7 +58,7 @@ tags:
 	ctags -R
 
 clean: subdirs_clean
-	rm -f *.[oa] *~ core
+	$(RM) *.[oa] *~ core
 
 subdirs: $(patsubst %, _dir_%, $(DIRS))
 subdirs_clean: $(patsubst %, _dirclean_%, $(DIRS))
diff --git a/libc/misc/assert/Makefile b/libc/misc/assert/Makefile
index 6dc004b7b..cfd469c14 100644
--- a/libc/misc/assert/Makefile
+++ b/libc/misc/assert/Makefile
@@ -40,4 +40,4 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	rm -f *.[oa] *~ core
+	$(RM) *.[oa] *~ core
diff --git a/libc/misc/ctype/Makefile b/libc/misc/ctype/Makefile
index dc73ba7e9..26bb33731 100644
--- a/libc/misc/ctype/Makefile
+++ b/libc/misc/ctype/Makefile
@@ -65,5 +65,5 @@ $(MOBJx): $(MSRC)
 $(OBJS): Makefile
 
 clean:
-	rm -f *.[oa] *~ core
+	$(RM) *.[oa] *~ core
 
diff --git a/libc/misc/dirent/Makefile b/libc/misc/dirent/Makefile
index c3dc95a8f..4ccf3d3e0 100644
--- a/libc/misc/dirent/Makefile
+++ b/libc/misc/dirent/Makefile
@@ -42,5 +42,5 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	rm -f *.[oa] *~ core
+	$(RM) *.[oa] *~ core
 
diff --git a/libc/misc/error/Makefile b/libc/misc/error/Makefile
index cb293b01a..754010688 100644
--- a/libc/misc/error/Makefile
+++ b/libc/misc/error/Makefile
@@ -35,5 +35,5 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	rm -f *.[oa] *~ core
+	$(RM) *.[oa] *~ core
 
diff --git a/libc/misc/file/Makefile b/libc/misc/file/Makefile
index 195097e92..fc1a1bfc3 100644
--- a/libc/misc/file/Makefile
+++ b/libc/misc/file/Makefile
@@ -44,5 +44,5 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	rm -f *.[oa] *~ core
+	$(RM) *.[oa] *~ core
 
diff --git a/libc/misc/fnmatch/Makefile b/libc/misc/fnmatch/Makefile
index d3373a0f7..af067bd15 100644
--- a/libc/misc/fnmatch/Makefile
+++ b/libc/misc/fnmatch/Makefile
@@ -40,5 +40,5 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	rm -f *.[oa] *~ core
+	$(RM) *.[oa] *~ core
 
diff --git a/libc/misc/ftw/Makefile b/libc/misc/ftw/Makefile
index ae21c222c..a9df0c782 100644
--- a/libc/misc/ftw/Makefile
+++ b/libc/misc/ftw/Makefile
@@ -39,5 +39,5 @@ $(MOBJ): $(MSRC)
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	rm -f *.[oa] *~ core
+	$(RM) *.[oa] *~ core
 
diff --git a/libc/misc/glob/Makefile b/libc/misc/glob/Makefile
index e53c95b18..31a3b80fe 100644
--- a/libc/misc/glob/Makefile
+++ b/libc/misc/glob/Makefile
@@ -42,5 +42,5 @@ $(COBJS): %.o : %.c
 glob64.o: glob64.c glob.c
 
 clean:
-	rm -f *.[oa] *~ core
+	$(RM) *.[oa] *~ core
 
diff --git a/libc/misc/gnu/Makefile b/libc/misc/gnu/Makefile
index f2acc8bba..6e3fd8463 100644
--- a/libc/misc/gnu/Makefile
+++ b/libc/misc/gnu/Makefile
@@ -40,4 +40,4 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	rm -f *.[oa] *~ core
+	$(RM) *.[oa] *~ core
diff --git a/libc/misc/internals/Makefile b/libc/misc/internals/Makefile
index e9dd86b80..486cf8d55 100644
--- a/libc/misc/internals/Makefile
+++ b/libc/misc/internals/Makefile
@@ -53,5 +53,5 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	rm -f *.[oa] interp.c *~ core
+	$(RM) *.[oa] interp.c *~ core
 
diff --git a/libc/misc/intl/Makefile b/libc/misc/intl/Makefile
index 140ae31f3..df59c9d52 100644
--- a/libc/misc/intl/Makefile
+++ b/libc/misc/intl/Makefile
@@ -46,5 +46,5 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	rm -f *.[oa] *~ core
+	$(RM) *.[oa] *~ core
 
diff --git a/libc/misc/locale/Makefile b/libc/misc/locale/Makefile
index 17b208b2e..752f0aa0f 100644
--- a/libc/misc/locale/Makefile
+++ b/libc/misc/locale/Makefile
@@ -67,6 +67,6 @@ locale_data.o:
 $(OBJS): Makefile
 
 clean:
-	rm -f *.[oa] *~ core locale_data.c
+	$(RM) *.[oa] *~ core locale_data.c
 
 .PHONY: data
diff --git a/libc/misc/mntent/Makefile b/libc/misc/mntent/Makefile
index 65fa34623..7430dfe00 100644
--- a/libc/misc/mntent/Makefile
+++ b/libc/misc/mntent/Makefile
@@ -40,5 +40,5 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	rm -f *.[oa] *~ core
+	$(RM) *.[oa] *~ core
 
diff --git a/libc/misc/pthread/Makefile b/libc/misc/pthread/Makefile
index 3146c7a9a..d01af1d74 100644
--- a/libc/misc/pthread/Makefile
+++ b/libc/misc/pthread/Makefile
@@ -45,5 +45,5 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	rm -f *.[oa] *~ core
+	$(RM) *.[oa] *~ core
 
diff --git a/libc/misc/regex/Makefile b/libc/misc/regex/Makefile
index fe2920ba6..5bdda32b4 100644
--- a/libc/misc/regex/Makefile
+++ b/libc/misc/regex/Makefile
@@ -40,5 +40,5 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	rm -f *.[oa] *~ core
+	$(RM) *.[oa] *~ core
 
diff --git a/libc/misc/search/Makefile b/libc/misc/search/Makefile
index fa28f21d6..9d579b964 100644
--- a/libc/misc/search/Makefile
+++ b/libc/misc/search/Makefile
@@ -69,5 +69,5 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	rm -f *.[oa] *~ core
+	$(RM) *.[oa] *~ core
 
diff --git a/libc/misc/statfs/Makefile b/libc/misc/statfs/Makefile
index 89eb7fd89..55c21b8f6 100644
--- a/libc/misc/statfs/Makefile
+++ b/libc/misc/statfs/Makefile
@@ -43,5 +43,5 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	rm -f *.[oa] *~ core
+	$(RM) *.[oa] *~ core
 
diff --git a/libc/misc/syslog/Makefile b/libc/misc/syslog/Makefile
index f715eceec..8eb583c51 100644
--- a/libc/misc/syslog/Makefile
+++ b/libc/misc/syslog/Makefile
@@ -40,5 +40,5 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	rm -f *.[oa] *~ core
+	$(RM) *.[oa] *~ core
 
diff --git a/libc/misc/sysvipc/Makefile b/libc/misc/sysvipc/Makefile
index b3c60cb03..eaf5dd1ec 100644
--- a/libc/misc/sysvipc/Makefile
+++ b/libc/misc/sysvipc/Makefile
@@ -65,7 +65,7 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean: subdirs_clean
-	rm -f *.[oa] *~ core
+	$(RM) *.[oa] *~ core
 
 subdirs: $(patsubst %, _dir_%, $(DIRS))
 subdirs_clean: $(patsubst %, _dirclean_%, $(DIRS))
diff --git a/libc/misc/time/Makefile b/libc/misc/time/Makefile
index 302214baf..29ed0d949 100644
--- a/libc/misc/time/Makefile
+++ b/libc/misc/time/Makefile
@@ -65,5 +65,5 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	rm -f *.[oa] *~ core
+	$(RM) *.[oa] *~ core
 
diff --git a/libc/misc/ttyent/Makefile b/libc/misc/ttyent/Makefile
index 6a5fbcbfe..1b814089e 100644
--- a/libc/misc/ttyent/Makefile
+++ b/libc/misc/ttyent/Makefile
@@ -35,5 +35,5 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	rm -f *.[oa] *~ core
+	$(RM) *.[oa] *~ core
 
diff --git a/libc/misc/utmp/Makefile b/libc/misc/utmp/Makefile
index 1a50070db..7a506a45d 100644
--- a/libc/misc/utmp/Makefile
+++ b/libc/misc/utmp/Makefile
@@ -40,4 +40,4 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	rm -f *.[oa] *~ core
+	$(RM) *.[oa] *~ core
diff --git a/libc/misc/wchar/Makefile b/libc/misc/wchar/Makefile
index 4a3e2fc7a..c449e3f91 100644
--- a/libc/misc/wchar/Makefile
+++ b/libc/misc/wchar/Makefile
@@ -66,5 +66,5 @@ iconv.target: wchar.c
 	$(STRIPTOOL) -x -R .note -R .comment $@
 
 clean:
-	rm -f *.[oa] *~ core iconv.target
+	$(RM) *.[oa] *~ core iconv.target
 
diff --git a/libc/misc/wctype/Makefile b/libc/misc/wctype/Makefile
index 44734945c..291036451 100644
--- a/libc/misc/wctype/Makefile
+++ b/libc/misc/wctype/Makefile
@@ -57,5 +57,5 @@ $(MOBJx): $(MSRC)
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	rm -f *.[oa] *~ core
+	$(RM) *.[oa] *~ core
 
diff --git a/libc/misc/wordexp/Makefile b/libc/misc/wordexp/Makefile
index edfd819d5..5e29f4704 100644
--- a/libc/misc/wordexp/Makefile
+++ b/libc/misc/wordexp/Makefile
@@ -35,5 +35,5 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	rm -f *.[oa] *~ core
+	$(RM) *.[oa] *~ core