Revert to rev 1.41.

Some didn't like it.

1 files changed, 9 insertions, 11 deletions

diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index d89ebbb..490209e 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -88,8 +88,6 @@ PFLAGS		?=
 RC		?=	f77
 RFLAGS		?=
 
-RM		?=	rm -f
-
 SHELL		?=	sh
 
 YACC		?=	yacc
@@ -139,13 +137,13 @@ HTAGSFLAGS=
 .y.o:
 	${YACC} ${YFLAGS} ${.IMPSRC}
 	${CC} ${CFLAGS} -c y.tab.c
-	${RM} y.tab.c
+	rm -f y.tab.c
 	mv y.tab.o ${.TARGET}
 
 .l.o:
 	${LEX} ${LFLAGS} ${.IMPSRC}
 	${CC} ${CFLAGS} -c lex.yy.c
-	${RM} lex.yy.c
+	rm -f lex.yy.c
 	mv lex.yy.o ${.TARGET}
 
 .y.c:
@@ -159,12 +157,12 @@ HTAGSFLAGS=
 .c.a:
 	${CC} ${CFLAGS} -c ${.IMPSRC}
 	${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
-	${RM} ${.PREFIX}.o
+	rm -f ${.PREFIX}.o
 
 .f.a:
 	${FC} ${FFLAGS} -c ${.IMPSRC}
 	${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
-	${RM} ${.PREFIX}.o
+	rm -f ${.PREFIX}.o
 
 .else
 
@@ -202,12 +200,12 @@ HTAGSFLAGS=
 .y.o:
 	${YACC} ${YFLAGS} ${.IMPSRC}
 	${CC} ${CFLAGS} -c y.tab.c -o ${.TARGET}
-	${RM} y.tab.c
+	rm -f y.tab.c
 
 .l.o:
 	${LEX} -t ${LFLAGS} ${.IMPSRC} > ${.PREFIX}.tmp.c
 	${CC} ${CFLAGS} -c ${.PREFIX}.tmp.c -o ${.TARGET}
-	${RM} ${.PREFIX}.tmp.c
+	rm -f ${.PREFIX}.tmp.c
 
 # XXX not -j safe
 .y.c:
@@ -223,18 +221,18 @@ HTAGSFLAGS=
 .f.out .F.out .r.out .e.out:
 	${FC} ${EFLAGS} ${RFLAGS} ${FFLAGS} ${LDFLAGS} ${.IMPSRC} \
 	    ${LDLIBS} -o ${.TARGET}
-	${RM} ${.PREFIX}.o
+	rm -f ${.PREFIX}.o
 
 # XXX not -j safe
 .y.out:
 	${YACC} ${YFLAGS} ${.IMPSRC}
 	${CC} ${CFLAGS} ${LDFLAGS} y.tab.c ${LDLIBS} -ly -o ${.TARGET}
-	${RM} y.tab.c
+	rm -f y.tab.c
 
 .l.out:
 	${LEX} -t ${LFLAGS} ${.IMPSRC} > ${.PREFIX}.tmp.c
 	${CC} ${CFLAGS} ${LDFLAGS} ${.PREFIX}.tmp.c ${LDLIBS} -ll -o ${.TARGET}
-	${RM} ${.PREFIX}.tmp.c
+	rm -f ${.PREFIX}.tmp.c
 
 .endif