``mv'' -> ``mv -f''

``rm'' -> ``rm -f''
so mv/rm may not ask for confirmation if you are not root

36 files changed, 158 insertions, 124 deletions

diff --git a/bin/expr/Makefile b/bin/expr/Makefile
index c98e59f..63c0055 100644
--- a/bin/expr/Makefile
+++ b/bin/expr/Makefile
@@ -1,5 +1,5 @@
 #	/b/source/CVS/src/bin/expr/Makefile,v 1.5 1993/06/14 19:56:06 jtc Exp
-#	$Id: Makefile,v 1.6 1994/09/24 02:55:36 davidg Exp $
+#	$Id: Makefile,v 1.7 1995/05/30 00:06:49 rgrimes Exp $
 
 PROG=		expr
 SRCS=		expr.c
@@ -7,7 +7,7 @@ CLEANFILES+=	expr.c y.tab.h
 
 expr.c:
 	${YACC} -d ${.IMPSRC}
-	mv y.tab.c expr.c
+	mv -f y.tab.c expr.c
 
 .include <bsd.prog.mk>
 
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index e18fcde..e6024eb 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.7 1995/03/12 09:37:26 phk Exp $
+# $Id: Makefile,v 1.8 1995/03/12 20:17:07 phk Exp $
 #
 
 LIB=	gcc
@@ -17,12 +17,12 @@ P2OBJS=${LIB2OBJS:.o=.po}
 ${LIB1OBJS}: libgcc1.c
 	${CC} -c ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.CURDIR}/libgcc1.c
 	@${LD} -x -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 
 ${LIB2OBJS}: libgcc2.c
 	${CC} -c ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.CURDIR}/libgcc2.c
 	@${LD} -x -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 
 .if !defined(NOPIC)
 ${LIB1SOBJS}: libgcc1.c
diff --git a/gnu/lib/libgmp/Makefile b/gnu/lib/libgmp/Makefile
index 11ebb87..d59fc24 100644
--- a/gnu/lib/libgmp/Makefile
+++ b/gnu/lib/libgmp/Makefile
@@ -1,5 +1,5 @@
 # Makefile for libgmp
-# $Id: Makefile,v 1.2 1995/11/25 00:14:03 peter Exp $
+# $Id: Makefile,v 1.3 1995/11/26 09:51:42 bde Exp $
 
 LIB=    gmp
 SRCS=	$(GMP_SRCS)
@@ -53,10 +53,10 @@ cre-conv-tab: gmp-mparam.h
 
 gmp-mparam.h: cre-mparam
 	./cre-mparam > tmp-${.TARGET}
-	mv tmp-${.TARGET} ${.TARGET}
+	mv -f tmp-${.TARGET} ${.TARGET}
 
 mp_bases.c: cre-conv-tab
 	./cre-conv-tab > tmp-${.TARGET}
-	mv tmp-${.TARGET} ${.TARGET}
+	mv -f tmp-${.TARGET} ${.TARGET}
 
 .include <bsd.lib.mk>
diff --git a/gnu/lib/libregex/test/Makefile b/gnu/lib/libregex/test/Makefile
index 84ebfcb..e8516a8 100644
--- a/gnu/lib/libregex/test/Makefile
+++ b/gnu/lib/libregex/test/Makefile
@@ -1,3 +1,5 @@
+#	$Id: $
+
 # Generated automatically from Makefile.in by configure.
 # Makefile for regex testing.
 #
@@ -65,7 +67,7 @@ regex: $(regex_o) $(common_o) $(test_o) main.o
 dregex.o: ../regex.c ../regex.h
 	rm -f $@
 	$(CC) $(ALL_CPPFLAGS) $(CFLAGS) -c ../$(srcdir)/regex.c
-	mv regex.o $@
+	mv -f regex.o $@
 
 # iregex is the interactive regex.
 iregex: $(common_o) $(regex_o) iregex.o
diff --git a/gnu/lib/libregex/test/Makefile.in b/gnu/lib/libregex/test/Makefile.in
index fea1f10..5fc51be 100644
--- a/gnu/lib/libregex/test/Makefile.in
+++ b/gnu/lib/libregex/test/Makefile.in
@@ -1,3 +1,5 @@
+#	$Id: $
+
 # Makefile for regex testing.
 #
 # Copyright (C) 1992 Free Software Foundation, Inc.
@@ -64,7 +66,7 @@ regex: $(regex_o) $(common_o) $(test_o) main.o
 dregex.o: ../regex.c ../regex.h
 	rm -f $@
 	$(CC) $(ALL_CPPFLAGS) $(CFLAGS) -c ../$(srcdir)/regex.c
-	mv regex.o $@
+	mv -f regex.o $@
 
 # iregex is the interactive regex.
 iregex: $(common_o) $(regex_o) iregex.o
diff --git a/gnu/usr.bin/as/Makefile.in b/gnu/usr.bin/as/Makefile.in
index 9e76458..ba1696b 100644
--- a/gnu/usr.bin/as/Makefile.in
+++ b/gnu/usr.bin/as/Makefile.in
@@ -1,3 +1,5 @@
+#	$Id: $
+
 # Makefile for GNU Assembler
 #   Copyright (C) 1987-1992 Free Software Foundation, Inc.
 
@@ -306,7 +308,7 @@ targ-cpu.o : targ-cpu.c targ-env.h obj-format.h \
 doc: $(srcdir)/as.info
 
 $(srcdir)/as.info: $(srcdir)/doc/as.texinfo
-	(cd doc; make as.info; mv as.info $srcdir)
+	(cd doc; make as.info; mv -f as.info $srcdir)
 
 clean:
 	(cd doc ; $(MAKE) clean)
@@ -369,17 +371,17 @@ bootstrap3: force
 # Copy the object files from a particular stage into a subdirectory.
 stage1: force
 	-mkdir stage1
-	-mv $(STAGESTUFF) stage1
+	-mv -f $(STAGESTUFF) stage1
 	if [ -f stage1/as.new -a ! -f stage1/as ] ; then (cd stage1 ; ln -s as.new as) ; fi
 
 stage2: force
 	-mkdir stage2
-	-mv $(STAGESTUFF) stage2
+	-mv -f $(STAGESTUFF) stage2
 	if [ -f stage2/as.new -a ! -f stage2/as ] ; then (cd stage2 ; ln -s as.new as) ; fi
 
 stage3: force
 	-mkdir stage3
-	-mv $(STAGESTUFF) stage3
+	-mv -f $(STAGESTUFF) stage3
 	if [ -f stage3/as.new -a ! -f stage3/as ] ; then (cd stage3 ; ln -s as.new as) ; fi
 
 against=stage2
@@ -388,15 +390,15 @@ comparison: force
 	for i in $(STAGESTUFF) ; do cmp $$i $(against)/$$i ; done
 
 de-stage1: force
-	- (cd stage1 ; rm as ; mv -f * ..)
+	- (cd stage1 ; rm -f as ; mv -f * ..)
 	- rmdir stage1
 
 de-stage2: force
-	- (cd stage2 ; rm as ; mv -f * ..)
+	- (cd stage2 ; rm -f as ; mv -f * ..)
 	- rmdir stage2
 
 de-stage3: force
-	- (cd stage3 ; rm as ; mv -f * ..)
+	- (cd stage3 ; rm -f as ; mv -f * ..)
 	- rmdir stage3
 
 #In GNU Make, ignore whether `stage*' exists.
diff --git a/gnu/usr.bin/binutils/gdb/Makefile b/gnu/usr.bin/binutils/gdb/Makefile
index 68a86ae..942a967 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile
+++ b/gnu/usr.bin/binutils/gdb/Makefile
@@ -1,3 +1,5 @@
+#	$Id: $
+
 PROG = gdb
 BINDIR= /usr/bin
 CLEANFILES+= y.tab.h c-exp.tab.c ch-exp.tab.c m2-exp.tab.c
@@ -24,24 +26,24 @@ c-exp.tab.c: $(.CURDIR)/c-exp.y
 	sed -e '/extern.*malloc/d'  -e '/extern.*realloc/d'  -e '/extern.*free/d' \
          -e '/include.*malloc.h/d'  -e 's/malloc/xmalloc/g'  \
          -e 's/realloc/xrealloc/g'  < y.tab.c > c-exp.new
-	rm y.tab.c
-	mv c-exp.new ./c-exp.tab.c
+	rm -f y.tab.c
+	mv -f c-exp.new ./c-exp.tab.c
 
 ch-exp.tab.c: $(.CURDIR)/ch-exp.y
 	yacc -d -p ch_ $(.CURDIR)/ch-exp.y
 	sed -e '/extern.*malloc/d'  -e '/extern.*realloc/d'  -e '/extern.*free/d' \
          -e '/include.*malloc.h/d'  -e 's/malloc/xmalloc/g'  \
          -e 's/realloc/xrealloc/g'  < y.tab.c > ch-exp.new
-	rm y.tab.c
-	mv ch-exp.new ./ch-exp.tab.c
+	rm -f y.tab.c
+	mv -f ch-exp.new ./ch-exp.tab.c
 
 m2-exp.tab.c: $(.CURDIR)/m2-exp.y
 	yacc -d -p m2_ $(.CURDIR)/m2-exp.y
 	sed -e '/extern.*malloc/d'  -e '/extern.*realloc/d'  -e '/extern.*free/d' \
          -e '/include.*malloc.h/d'  -e 's/malloc/xmalloc/g'  \
          -e 's/realloc/xrealloc/g'  < y.tab.c > m2-exp.new
-	rm y.tab.c
-	mv m2-exp.new ./m2-exp.tab.c
+	rm -f y.tab.c
+	mv -f m2-exp.new ./m2-exp.tab.c
 
 
 CFLAGS+= -I$(.CURDIR)/. -I${DESTDIR}/usr/include/readline -I$(.CURDIR)/../bfd
diff --git a/gnu/usr.bin/cc/libgcc/Makefile b/gnu/usr.bin/cc/libgcc/Makefile
index e18fcde..e6024eb 100644
--- a/gnu/usr.bin/cc/libgcc/Makefile
+++ b/gnu/usr.bin/cc/libgcc/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.7 1995/03/12 09:37:26 phk Exp $
+# $Id: Makefile,v 1.8 1995/03/12 20:17:07 phk Exp $
 #
 
 LIB=	gcc
@@ -17,12 +17,12 @@ P2OBJS=${LIB2OBJS:.o=.po}
 ${LIB1OBJS}: libgcc1.c
 	${CC} -c ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.CURDIR}/libgcc1.c
 	@${LD} -x -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 
 ${LIB2OBJS}: libgcc2.c
 	${CC} -c ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.CURDIR}/libgcc2.c
 	@${LD} -x -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 
 .if !defined(NOPIC)
 ${LIB1SOBJS}: libgcc1.c
diff --git a/gnu/usr.bin/gdb/gdb/Makefile b/gnu/usr.bin/gdb/gdb/Makefile
index 68a86ae..942a967 100644
--- a/gnu/usr.bin/gdb/gdb/Makefile
+++ b/gnu/usr.bin/gdb/gdb/Makefile
@@ -1,3 +1,5 @@
+#	$Id: $
+
 PROG = gdb
 BINDIR= /usr/bin
 CLEANFILES+= y.tab.h c-exp.tab.c ch-exp.tab.c m2-exp.tab.c
@@ -24,24 +26,24 @@ c-exp.tab.c: $(.CURDIR)/c-exp.y
 	sed -e '/extern.*malloc/d'  -e '/extern.*realloc/d'  -e '/extern.*free/d' \
          -e '/include.*malloc.h/d'  -e 's/malloc/xmalloc/g'  \
          -e 's/realloc/xrealloc/g'  < y.tab.c > c-exp.new
-	rm y.tab.c
-	mv c-exp.new ./c-exp.tab.c
+	rm -f y.tab.c
+	mv -f c-exp.new ./c-exp.tab.c
 
 ch-exp.tab.c: $(.CURDIR)/ch-exp.y
 	yacc -d -p ch_ $(.CURDIR)/ch-exp.y
 	sed -e '/extern.*malloc/d'  -e '/extern.*realloc/d'  -e '/extern.*free/d' \
          -e '/include.*malloc.h/d'  -e 's/malloc/xmalloc/g'  \
          -e 's/realloc/xrealloc/g'  < y.tab.c > ch-exp.new
-	rm y.tab.c
-	mv ch-exp.new ./ch-exp.tab.c
+	rm -f y.tab.c
+	mv -f ch-exp.new ./ch-exp.tab.c
 
 m2-exp.tab.c: $(.CURDIR)/m2-exp.y
 	yacc -d -p m2_ $(.CURDIR)/m2-exp.y
 	sed -e '/extern.*malloc/d'  -e '/extern.*realloc/d'  -e '/extern.*free/d' \
          -e '/include.*malloc.h/d'  -e 's/malloc/xmalloc/g'  \
          -e 's/realloc/xrealloc/g'  < y.tab.c > m2-exp.new
-	rm y.tab.c
-	mv m2-exp.new ./m2-exp.tab.c
+	rm -f y.tab.c
+	mv -f m2-exp.new ./m2-exp.tab.c
 
 
 CFLAGS+= -I$(.CURDIR)/. -I${DESTDIR}/usr/include/readline -I$(.CURDIR)/../bfd
diff --git a/gnu/usr.bin/groff/Makefile.cfg b/gnu/usr.bin/groff/Makefile.cfg
index 406e24e..69e67eb 100644
--- a/gnu/usr.bin/groff/Makefile.cfg
+++ b/gnu/usr.bin/groff/Makefile.cfg
@@ -1,3 +1,5 @@
+#	$Id: $
+
 BINDIR?=	/usr/bin
 SHAREDIR?=	/usr/share
 SHELL=		/bin/sh
@@ -89,13 +91,13 @@ CFLAGS+=$(DEFINES)
 
 .y.o:
 	$(YACC) $(YFLAGS) $(.IMPSRC)
-	mv y.tab.c $(.PREFIX).cc
-	mv y.tab.h $(.PREFIX).tab.h
+	mv -f y.tab.c $(.PREFIX).cc
+	mv -f y.tab.h $(.PREFIX).tab.h
 	${CXX} ${CXXFLAGS} -c $(.PREFIX).cc -o ${.TARGET}
 .y.cc:
 	$(YACC) $(YFLAGS) $(.IMPSRC)
-	mv y.tab.c $(.PREFIX).cc
-	mv y.tab.h $(.PREFIX).tab.h
+	mv -f y.tab.c $(.PREFIX).cc
+	mv -f y.tab.h $(.PREFIX).tab.h
 
 .SUFFIXES: .man .1 .2 .3 .4 .5 .6 .7 .8
 
diff --git a/gnu/usr.bin/groff/Makefile.comm b/gnu/usr.bin/groff/Makefile.comm
index b3d24af..20a0e69 100644
--- a/gnu/usr.bin/groff/Makefile.comm
+++ b/gnu/usr.bin/groff/Makefile.comm
@@ -1,3 +1,5 @@
+#	$Id: $
+
 # Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 #
@@ -93,14 +95,14 @@ extraclean:
 	else \
 	  $(YACC) $(YACCFLAGS) $<; \
 	fi
-	mv y.tab.c $@
+	mv -f y.tab.c $@
 # Avoid ending up with two versions of $(YTABH).
 	if test -n "$(YTABH)"; then \
 	  if test -f $(srcdir)/$(YTABH); then \
 	    rm -f $(YTABH); \
-	    mv y.tab.h $(srcdir)/$(YTABH); \
+	    mv -f y.tab.h $(srcdir)/$(YTABH); \
 	  else \
-	    mv y.tab.h $(YTABH); \
+	    mv -f y.tab.h $(YTABH); \
 	  fi; \
 	fi
 
@@ -217,7 +219,7 @@ uninstall_dev:
 
 .PHONY: depend_src
 depend_src: depend.temp
-	mv depend.temp Makefile.dep
+	mv -f depend.temp Makefile.dep
 
 depend.temp: FORCE
 	> depend.temp;
@@ -227,7 +229,7 @@ depend.temp: FORCE
 	  || $(CC) $(ALL_CFLAGS) -MM $(CSRCS) >>depend.temp
 	if test -n "$(YTABH)"; then \
 	  sed -e 's|$(YTABH)|$(YTABC)|g' depend.temp >depend.temp1; \
-	  mv depend.temp1 depend.temp; \
+	  mv -f depend.temp1 depend.temp; \
 	fi
 
 .PHONY: TAGS_src
diff --git a/gnu/usr.bin/groff/Makefile.in b/gnu/usr.bin/groff/Makefile.in
index 321fc2e..9398ffd 100644
--- a/gnu/usr.bin/groff/Makefile.in
+++ b/gnu/usr.bin/groff/Makefile.in
@@ -1,3 +1,5 @@
+#	$Id: $
+
 # Copyright (C) 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 #
@@ -338,7 +340,7 @@ dist:
 	done; \
 	rm -f Makefile; \
 	$(LN_S) $$srcdir/Makefile.init Makefile
-	mv tmp groff-$(version)
+	mv -f tmp groff-$(version)
 	tar cfh - groff-$(version) | gzip -c >groff-$(version).tar.gz
 	rm -fr groff-$(version)
 
diff --git a/gnu/usr.bin/gzip/Makefile b/gnu/usr.bin/gzip/Makefile
index 736698d..a134092 100644
--- a/gnu/usr.bin/gzip/Makefile
+++ b/gnu/usr.bin/gzip/Makefile
@@ -1,4 +1,5 @@
 #       @(#)Makefile    5.3 (Berkeley) 5/12/90
+#	$Id: $
 
 PROG=	gzip
 SRCS=	gzip.c zip.c deflate.c trees.c bits.c unzip.c inflate.c util.c \
@@ -25,7 +26,7 @@ beforeinstall:
 match.o: ${.CURDIR}/match.S
 	$(CPP) ${.CURDIR}/match.S >_match.s
 	$(CC) -c _match.s
-	mv _match.o match.o
+	mv -f _match.o match.o
 	rm -f _match.s
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/ld/rtld/Makefile b/gnu/usr.bin/ld/rtld/Makefile
index 5898649..7fc09fc 100644
--- a/gnu/usr.bin/ld/rtld/Makefile
+++ b/gnu/usr.bin/ld/rtld/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.17 1996/01/11 17:27:16 phk Exp $
+#	$Id: Makefile,v 1.18 1996/01/11 17:49:55 phk Exp $
 
 PROG=	ld.so
 SRCS=	mdprologue.S rtld.c malloc.c shlib.c etc.c md.c
@@ -26,8 +26,8 @@ realinstall:
 		:
 	-chflags noschg ${DESTDIR}${BINDIR}/${PROG}
 	-ln -f ${DESTDIR}${BINDIR}/${PROG} ${DESTDIR}${BINDIR}/${PROG}.old
-	mv ${DESTDIR}${BINDIR}/${PROG}.new ${DESTDIR}${BINDIR}/${PROG}
+	mv -f ${DESTDIR}${BINDIR}/${PROG}.new ${DESTDIR}${BINDIR}/${PROG}
 	chflags schg ${DESTDIR}${BINDIR}/${PROG}
-	-rm ${DESTDIR}${BINDIR}/${PROG}.old
+	-rm -f ${DESTDIR}${BINDIR}/${PROG}.old
 
 .include <bsd.prog.mk>
diff --git a/lib/csu/i386/Makefile b/lib/csu/i386/Makefile
index 4f665ca..fb74e6b 100644
--- a/lib/csu/i386/Makefile
+++ b/lib/csu/i386/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.6 (Berkeley) 5/22/91
-#	$Id: Makefile,v 1.22 1995/10/29 09:49:18 phk Exp $
+#	$Id: Makefile,v 1.23 1995/11/02 12:42:41 ache Exp $
 
 CFLAGS+=        -DLIBC_SCCS -fno-omit-frame-pointer
 OBJS=		crt0.o c++rt0.o gcrt0.o scrt0.o sgcrt0.o
@@ -14,12 +14,12 @@ all: ${OBJS}
 crt0.o: crt0.c
 	${CC} ${CFLAGS} -c -DCRT0 -DDYNAMIC ${.CURDIR}/crt0.c -o ${.TARGET}
 	${LD} -x -r ${.TARGET}
-	mv a.out ${.TARGET}
+	mv -f a.out ${.TARGET}
 
 c++rt0.o: c++rt0.c
 	${CC} ${CFLAGS} -fpic -c ${.CURDIR}/c++rt0.c
 	@${LD} -x -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 
 #
 # gcrt0.o doesn't really depend on crt0.o, but this is the easiest way
@@ -28,19 +28,19 @@ c++rt0.o: c++rt0.c
 gcrt0.o: crt0.o
 	${CC} ${CFLAGS} -c -DMCRT0 -DDYNAMIC ${.CURDIR}/crt0.c -o ${.TARGET}
 	${LD} -x -r ${.TARGET}
-	mv a.out ${.TARGET}
+	mv -f a.out ${.TARGET}
 
 # dependencies fudged as for gcrt0.o
 scrt0.o: crt0.o
 	${CC} ${CFLAGS} -c -DCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}
 	${LD} -x -r ${.TARGET}
-	mv a.out ${.TARGET}
+	mv -f a.out ${.TARGET}
 
 # dependencies fudged as for gcrt0.o
 sgcrt0.o: scrt0.o
 	${CC} ${CFLAGS} -c -DMCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}
 	${LD} -x -r ${.TARGET}
-	mv a.out ${.TARGET}
+	mv -f a.out ${.TARGET}
 
 beforeinstall:
 	cmp -s ${.CURDIR}/dlfcn.h ${DESTDIR}/usr/include/dlfcn.h || \
diff --git a/lib/libc/string/Makefile.inc b/lib/libc/string/Makefile.inc
index dddea781..315c899 100644
--- a/lib/libc/string/Makefile.inc
+++ b/lib/libc/string/Makefile.inc
@@ -1,4 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#	$Id: $
 
 .PATH: ${.CURDIR}/${MACHINE}/string ${.CURDIR}/string
 
@@ -16,12 +17,12 @@ OBJS+=	bzero.o
 bzero.o: memset.c
 	${CC} -DBZERO ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
 	@${LD} -x -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 
 bzero.po: memset.c
 	${CC} -DBZERO ${CFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
 	@${LD} -X -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 .endif
 
 # If no machine specific memmove(3), build one out of bcopy(3).
@@ -30,12 +31,12 @@ OBJS+=	memmove.o
 memmove.o: bcopy.c
 	${CC} -DMEMMOVE ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
 	@${LD} -x -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 
 memmove.po: bcopy.c
 	${CC} -DMEMMOVE ${CFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
 	@${LD} -X -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 .endif
 
 # If no machine specific memcpy(3), build one out of bcopy(3).
@@ -44,12 +45,12 @@ OBJS+=	memcpy.o
 memcpy.o: bcopy.c
 	${CC} -DMEMCOPY ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
 	@${LD} -x -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 
 memcpy.po: bcopy.c
 	${CC} -DMEMCOPY ${CFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
 	@${LD} -X -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 .endif
 
 # If no machine specific strchr(3), build one out of index(3).
@@ -58,12 +59,12 @@ OBJS+=	strchr.o
 strchr.o: index.c
 	${CC} -DSTRCHR ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
 	@${LD} -x -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 
 strchr.po: index.c
 	${CC} -DSTRCHR ${CFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
 	@${LD} -X -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 .endif
 
 # If no machine specific strrchr(3), build one out of rindex(3).
@@ -72,12 +73,12 @@ OBJS+=	strrchr.o
 strrchr.o: rindex.c
 	${CC} -DSTRRCHR ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
 	@${LD} -x -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 
 strrchr.po: rindex.c
 	${CC} -DSTRRCHR ${CFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
 	@${LD} -X -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 .endif
 #
 MAN3+=	string/bcmp.3 string/bcopy.3 string/bstring.3 string/bzero.3 \
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index 83d9e46..0e23be3 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -1,4 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/17/93
+#	$Id: $
 
 # sys sources
 .PATH: ${.CURDIR}/${MACHINE}/sys ${.CURDIR}/sys
@@ -44,7 +45,7 @@ ${ASM}: ${.CURDIR}/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \
 	    ${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.o
 	@${LD} -x -r ${.PREFIX}.o
-	@mv a.out ${.PREFIX}.o
+	@mv -f a.out ${.PREFIX}.o
 
 PASM=	${ASM:.o=.po}
 ${PASM}: ${.CURDIR}/${MACHINE}/SYS.h /usr/include/sys/syscall.h
@@ -52,7 +53,7 @@ ${PASM}: ${.CURDIR}/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \
 	    ${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.po
 	@${LD} -x -r ${.PREFIX}.po
-	@mv a.out ${.PREFIX}.po
+	@mv -f a.out ${.PREFIX}.po
 
 SASM=	${ASM:.o=.so}
 ${SASM}: ${.CURDIR}/${MACHINE}/SYS.h /usr/include/sys/syscall.h
@@ -65,7 +66,7 @@ ${PSEUDO}: ${.CURDIR}/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' | \
 	    ${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.o
 	@${LD} -x -r ${.PREFIX}.o
-	@mv a.out ${.PREFIX}.o
+	@mv -f a.out ${.PREFIX}.o
 
 PPSEUDO=${PSEUDO:.o=.po}
 ${PPSEUDO}: ${.CURDIR}/${MACHINE}/SYS.h /usr/include/sys/syscall.h
@@ -73,7 +74,7 @@ ${PPSEUDO}: ${.CURDIR}/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' | \
 	    ${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.po
 	@${LD} -x -r ${.PREFIX}.po
-	@mv a.out ${.PREFIX}.po
+	@mv -f a.out ${.PREFIX}.po
 
 SPSEUDO=${PSEUDO:.o=.so}
 ${SPSEUDO}: ${.CURDIR}/${MACHINE}/SYS.h /usr/include/sys/syscall.h
diff --git a/lib/libc_r/string/Makefile.inc b/lib/libc_r/string/Makefile.inc
index 861fdf7..1296824 100644
--- a/lib/libc_r/string/Makefile.inc
+++ b/lib/libc_r/string/Makefile.inc
@@ -1,4 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#	$Id: $
 
 .PATH: ${.CURDIR}/../libc/${MACHINE}/string ${.CURDIR}/../libc/string
 
@@ -16,12 +17,12 @@ OBJS+=	bzero.o
 bzero.o: memset.c
 	${CC} -DBZERO ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
 	@${LD} -x -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 
 bzero.po: memset.c
 	${CC} -DBZERO ${CFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
 	@${LD} -X -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 .endif
 
 # If no machine specific memmove(3), build one out of bcopy(3).
@@ -30,12 +31,12 @@ OBJS+=	memmove.o
 memmove.o: bcopy.c
 	${CC} -DMEMMOVE ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
 	@${LD} -x -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 
 memmove.po: bcopy.c
 	${CC} -DMEMMOVE ${CFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
 	@${LD} -X -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 .endif
 
 # If no machine specific memcpy(3), build one out of bcopy(3).
@@ -44,12 +45,12 @@ OBJS+=	memcpy.o
 memcpy.o: bcopy.c
 	${CC} -DMEMCOPY ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
 	@${LD} -x -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 
 memcpy.po: bcopy.c
 	${CC} -DMEMCOPY ${CFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
 	@${LD} -X -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 .endif
 
 # If no machine specific strchr(3), build one out of index(3).
@@ -58,12 +59,12 @@ OBJS+=	strchr.o
 strchr.o: index.c
 	${CC} -DSTRCHR ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
 	@${LD} -x -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 
 strchr.po: index.c
 	${CC} -DSTRCHR ${CFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
 	@${LD} -X -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 .endif
 
 # If no machine specific strrchr(3), build one out of rindex(3).
@@ -72,10 +73,10 @@ OBJS+=	strrchr.o
 strrchr.o: rindex.c
 	${CC} -DSTRRCHR ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
 	@${LD} -x -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 
 strrchr.po: rindex.c
 	${CC} -DSTRRCHR ${CFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
 	@${LD} -X -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 .endif
diff --git a/lib/libc_r/sys/Makefile.inc b/lib/libc_r/sys/Makefile.inc
index 0133541..3aa9a00 100644
--- a/lib/libc_r/sys/Makefile.inc
+++ b/lib/libc_r/sys/Makefile.inc
@@ -1,4 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/17/93
+#	$Id: $
 
 # sys sources
 .PATH: ${.CURDIR}/../libc/${MACHINE}/sys ${.CURDIR}/../libc/sys \
@@ -48,7 +49,7 @@ ${ASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \
 	    ${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.o
 	@${LD} -x -r ${.PREFIX}.o
-	@mv a.out ${.PREFIX}.o
+	@mv -f a.out ${.PREFIX}.o
 
 PASM=	${ASM:.o=.po}
 ${PASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
@@ -56,7 +57,7 @@ ${PASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \
 	    ${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.po
 	@${LD} -x -r ${.PREFIX}.po
-	@mv a.out ${.PREFIX}.po
+	@mv -f a.out ${.PREFIX}.po
 
 SASM=	${ASM:.o=.so}
 ${SASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
@@ -69,7 +70,7 @@ ${THREADASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nPRSYSCALL(${.PREFIX},_thread_sys_${.PREFIX})\n' | \
 	    ${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.o
 	@${LD} -x -r ${.PREFIX}.o
-	@mv a.out ${.PREFIX}.o
+	@mv -f a.out ${.PREFIX}.o
 
 PTHREADASM=	${THREADASM:.o=.po}
 ${PTHREADASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
@@ -77,7 +78,7 @@ ${PTHREADASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nPRSYSCALL(${.PREFIX},_thread_sys_${.PREFIX})\n' | \
 	    ${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.po
 	@${LD} -x -r ${.PREFIX}.po
-	@mv a.out ${.PREFIX}.po
+	@mv -f a.out ${.PREFIX}.po
 
 STHREADASM=	${THREADASM:.o=.so}
 ${STHREADASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
@@ -90,7 +91,7 @@ ${PSEUDO}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' | \
 	    ${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.o
 	@${LD} -x -r ${.PREFIX}.o
-	@mv a.out ${.PREFIX}.o
+	@mv -f a.out ${.PREFIX}.o
 
 PPSEUDO=${PSEUDO:.o=.po}
 ${PPSEUDO}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
@@ -98,7 +99,7 @@ ${PPSEUDO}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' | \
 	    ${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.po
 	@${LD} -x -r ${.PREFIX}.po
-	@mv a.out ${.PREFIX}.po
+	@mv -f a.out ${.PREFIX}.po
 
 SPSEUDO=${PSEUDO:.o=.so}
 ${SPSEUDO}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
diff --git a/lib/libdisk/Makefile b/lib/libdisk/Makefile
index 307c750..a81cddb 100644
--- a/lib/libdisk/Makefile
+++ b/lib/libdisk/Makefile
@@ -1,3 +1,5 @@
+#	$Id: $
+
 LIB=	disk
 SRCS=	blocks.c disklabel.c dkcksum.c chunk.c disk.c change.c \
 	create_chunk.c rules.c write_disk.c data.c
@@ -46,7 +48,7 @@ data.c:	${.CURDIR}/libdisk.h ${BOOTS}/boot1 ${BOOTS}/boot2
                 < ${BOOTS}/boot1 > tmp.c
 	file2c 'const unsigned char boot2[] = {' '};' \
                 < ${BOOTS}/boot2 >> tmp.c
-	mv tmp.c data.c
+	mv -f tmp.c data.c
 
 beforeinstall:
 	@${ECHO} installing libdisk.h
diff --git a/lib/libkse/sys/Makefile.inc b/lib/libkse/sys/Makefile.inc
index 0133541..3aa9a00 100644
--- a/lib/libkse/sys/Makefile.inc
+++ b/lib/libkse/sys/Makefile.inc
@@ -1,4 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/17/93
+#	$Id: $
 
 # sys sources
 .PATH: ${.CURDIR}/../libc/${MACHINE}/sys ${.CURDIR}/../libc/sys \
@@ -48,7 +49,7 @@ ${ASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \
 	    ${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.o
 	@${LD} -x -r ${.PREFIX}.o
-	@mv a.out ${.PREFIX}.o
+	@mv -f a.out ${.PREFIX}.o
 
 PASM=	${ASM:.o=.po}
 ${PASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
@@ -56,7 +57,7 @@ ${PASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \
 	    ${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.po
 	@${LD} -x -r ${.PREFIX}.po
-	@mv a.out ${.PREFIX}.po
+	@mv -f a.out ${.PREFIX}.po
 
 SASM=	${ASM:.o=.so}
 ${SASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
@@ -69,7 +70,7 @@ ${THREADASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nPRSYSCALL(${.PREFIX},_thread_sys_${.PREFIX})\n' | \
 	    ${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.o
 	@${LD} -x -r ${.PREFIX}.o
-	@mv a.out ${.PREFIX}.o
+	@mv -f a.out ${.PREFIX}.o
 
 PTHREADASM=	${THREADASM:.o=.po}
 ${PTHREADASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
@@ -77,7 +78,7 @@ ${PTHREADASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nPRSYSCALL(${.PREFIX},_thread_sys_${.PREFIX})\n' | \
 	    ${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.po
 	@${LD} -x -r ${.PREFIX}.po
-	@mv a.out ${.PREFIX}.po
+	@mv -f a.out ${.PREFIX}.po
 
 STHREADASM=	${THREADASM:.o=.so}
 ${STHREADASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
@@ -90,7 +91,7 @@ ${PSEUDO}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' | \
 	    ${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.o
 	@${LD} -x -r ${.PREFIX}.o
-	@mv a.out ${.PREFIX}.o
+	@mv -f a.out ${.PREFIX}.o
 
 PPSEUDO=${PSEUDO:.o=.po}
 ${PPSEUDO}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
@@ -98,7 +99,7 @@ ${PPSEUDO}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' | \
 	    ${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.po
 	@${LD} -x -r ${.PREFIX}.po
-	@mv a.out ${.PREFIX}.po
+	@mv -f a.out ${.PREFIX}.po
 
 SPSEUDO=${PSEUDO:.o=.so}
 ${SPSEUDO}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
diff --git a/lib/libm/Makefile b/lib/libm/Makefile
index d832963..6cc7d10 100644
--- a/lib/libm/Makefile
+++ b/lib/libm/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/08/05 01:52:05 wollman Exp $
 #
 # ieee		- for most IEEE machines, we hope.
 # mc68881	- the, ahem, mc68881.
@@ -159,10 +159,10 @@ depend: .depend
 .s.o:
 	${AS} -o ${.TARGET} ${.IMPSRC}
 	@${LD} -x -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 
 .s.po:
 	sed -f ${.CURDIR}/${HARDWARE}/mcount.sed ${.IMPSRC} | \
 	    ${AS} -o ${.TARGET}
 	@${LD} -X -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index 50d6c92..161a43f 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -1,5 +1,5 @@
 # Makefile for libpcap
-# $Id: Makefile,v 1.3 1995/02/23 18:47:06 ache Exp $
+# $Id: Makefile,v 1.4 1995/08/06 12:37:41 bde Exp $
 
 LIB=    pcap
 
@@ -25,7 +25,7 @@ beforeinstall:
 scanner.o: tokdefs.h
 
 tokdefs.h: grammar.c
-	mv y.tab.h tokdefs.h
+	mv -f y.tab.h tokdefs.h
 
 
 .include <bsd.lib.mk>
diff --git a/lib/libpthread/sys/Makefile.inc b/lib/libpthread/sys/Makefile.inc
index 0133541..3aa9a00 100644
--- a/lib/libpthread/sys/Makefile.inc
+++ b/lib/libpthread/sys/Makefile.inc
@@ -1,4 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/17/93
+#	$Id: $
 
 # sys sources
 .PATH: ${.CURDIR}/../libc/${MACHINE}/sys ${.CURDIR}/../libc/sys \
@@ -48,7 +49,7 @@ ${ASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \
 	    ${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.o
 	@${LD} -x -r ${.PREFIX}.o
-	@mv a.out ${.PREFIX}.o
+	@mv -f a.out ${.PREFIX}.o
 
 PASM=	${ASM:.o=.po}
 ${PASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
@@ -56,7 +57,7 @@ ${PASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \
 	    ${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.po
 	@${LD} -x -r ${.PREFIX}.po
-	@mv a.out ${.PREFIX}.po
+	@mv -f a.out ${.PREFIX}.po
 
 SASM=	${ASM:.o=.so}
 ${SASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
@@ -69,7 +70,7 @@ ${THREADASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nPRSYSCALL(${.PREFIX},_thread_sys_${.PREFIX})\n' | \
 	    ${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.o
 	@${LD} -x -r ${.PREFIX}.o
-	@mv a.out ${.PREFIX}.o
+	@mv -f a.out ${.PREFIX}.o
 
 PTHREADASM=	${THREADASM:.o=.po}
 ${PTHREADASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
@@ -77,7 +78,7 @@ ${PTHREADASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nPRSYSCALL(${.PREFIX},_thread_sys_${.PREFIX})\n' | \
 	    ${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.po
 	@${LD} -x -r ${.PREFIX}.po
-	@mv a.out ${.PREFIX}.po
+	@mv -f a.out ${.PREFIX}.po
 
 STHREADASM=	${THREADASM:.o=.so}
 ${STHREADASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
@@ -90,7 +91,7 @@ ${PSEUDO}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' | \
 	    ${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.o
 	@${LD} -x -r ${.PREFIX}.o
-	@mv a.out ${.PREFIX}.o
+	@mv -f a.out ${.PREFIX}.o
 
 PPSEUDO=${PSEUDO:.o=.po}
 ${PPSEUDO}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
@@ -98,7 +99,7 @@ ${PPSEUDO}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' | \
 	    ${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.po
 	@${LD} -x -r ${.PREFIX}.po
-	@mv a.out ${.PREFIX}.po
+	@mv -f a.out ${.PREFIX}.po
 
 SPSEUDO=${PSEUDO:.o=.so}
 ${SPSEUDO}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
diff --git a/lib/libss/Makefile b/lib/libss/Makefile
index 3a97aaf..88adaaa 100644
--- a/lib/libss/Makefile
+++ b/lib/libss/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.9 1995/08/06 12:24:05 bde Exp $
+#	$Id: Makefile,v 1.10 1995/08/06 12:41:07 bde Exp $
 
 LIB=	ss
 SRCS=	ss_err.c data.c error.c execute_cmd.c help.c invocation.c list_rqs.c \
@@ -16,12 +16,12 @@ LDADD+=	-lcom_err
 ss_err.h ss_err.c:	${.CURDIR}/ss_err.et
 	test -e ss_err.et || ln -s ${.CURDIR}/ss_err.et .
 	compile_et ss_err.et
-	-test -h ss_err.et && rm ss_err.et
+	-test -h ss_err.et && rm -f ss_err.et
 
 std_rqs.c:		${.CURDIR}/std_rqs.ct
 	test -e std_rqs.ct || ln -s ${.CURDIR}/std_rqs.ct .
 	mk_cmds std_rqs.ct
-	-test -h std_rqs.ct && rm std_rqs.ct
+	-test -h std_rqs.ct && rm -f std_rqs.ct
 
 beforeinstall:
 	-cd ${.CURDIR}; cmp -s ss.h ${DESTDIR}/usr/include/ss/ss.h || \
diff --git a/libexec/rtld-aout/Makefile b/libexec/rtld-aout/Makefile
index 5898649..7fc09fc 100644
--- a/libexec/rtld-aout/Makefile
+++ b/libexec/rtld-aout/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.17 1996/01/11 17:27:16 phk Exp $
+#	$Id: Makefile,v 1.18 1996/01/11 17:49:55 phk Exp $
 
 PROG=	ld.so
 SRCS=	mdprologue.S rtld.c malloc.c shlib.c etc.c md.c
@@ -26,8 +26,8 @@ realinstall:
 		:
 	-chflags noschg ${DESTDIR}${BINDIR}/${PROG}
 	-ln -f ${DESTDIR}${BINDIR}/${PROG} ${DESTDIR}${BINDIR}/${PROG}.old
-	mv ${DESTDIR}${BINDIR}/${PROG}.new ${DESTDIR}${BINDIR}/${PROG}
+	mv -f ${DESTDIR}${BINDIR}/${PROG}.new ${DESTDIR}${BINDIR}/${PROG}
 	chflags schg ${DESTDIR}${BINDIR}/${PROG}
-	-rm ${DESTDIR}${BINDIR}/${PROG}.old
+	-rm -f ${DESTDIR}${BINDIR}/${PROG}.old
 
 .include <bsd.prog.mk>
diff --git a/lkm/atapi/Makefile b/lkm/atapi/Makefile
index b1d54ff..43125cf 100644
--- a/lkm/atapi/Makefile
+++ b/lkm/atapi/Makefile
@@ -1,3 +1,5 @@
+#	$Id: $
+
 .PATH:          ${.CURDIR}/../../sys/i386/isa
 KMOD            = atapi_mod
 SRCS            = atapi.c wdc.h #wcd.h
@@ -27,6 +29,6 @@ wcd.h:
 .c.o:
 		-@$(LN) /sys/i386/include machine
 		$(CC) $(CFLAGS) -c $<
-		-@rm machine
+		-@rm -f machine
 
 .include <bsd.kmod.mk>
diff --git a/lkm/wcd/Makefile b/lkm/wcd/Makefile
index 162de4b..d855075 100644
--- a/lkm/wcd/Makefile
+++ b/lkm/wcd/Makefile
@@ -1,3 +1,5 @@
+#	$Id: $
+
 .PATH:          ${.CURDIR}/../../sys/i386/isa
 KMOD            = wcd_mod
 SRCS            = wcd.c wdc.h wcd.h
@@ -23,6 +25,6 @@ wcd.h:
 .c.o:
 		-@$(LN) /sys/i386/include machine
 		$(CC) $(CFLAGS) -c $<
-		-@rm machine
+		-@rm -f machine
 
 .include <bsd.kmod.mk>
diff --git a/share/doc/iso/wisc/figs/Makefile b/share/doc/iso/wisc/figs/Makefile
index 72aa29a..06fd958 100644
--- a/share/doc/iso/wisc/figs/Makefile
+++ b/share/doc/iso/wisc/figs/Makefile
@@ -1,4 +1,4 @@
-#
+# $Id: $
 #
 .SUFFIXES: .nr .grn
 
@@ -12,7 +12,7 @@ ALL = \
 all: $(ALL)
 
 clean:
-	rm  $(ALL)
+	rm -f $(ALL)
 
 .grn.nr:
 	grn -P$(PRINTER) $*.grn > $*.nr
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 132ebbb..9c5ffd6 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -1,6 +1,6 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.80 1996/05/02 14:19:35 phk Exp $
+#	$Id: Makefile.i386,v 1.81 1996/05/02 21:40:50 joerg Exp $
 #
 # Makefile for FreeBSD
 #
@@ -142,7 +142,7 @@ depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
 	MKDEP_CPP="${CPP}" ; export MKDEP_CPP ; \
 	mkdep -a -f .newdep -DLOCORE ${COPTS} ${SFILES} ${SYSTEM_SFILES}
 	rm -f .depend
-	mv .newdep .depend
+	mv -f .newdep .depend
 
 links:
 	egrep '#if' ${CFILES:Nswapkernel.c} | sed -f $S/conf/defines | \
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 132ebbb..9c5ffd6 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -1,6 +1,6 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.80 1996/05/02 14:19:35 phk Exp $
+#	$Id: Makefile.i386,v 1.81 1996/05/02 21:40:50 joerg Exp $
 #
 # Makefile for FreeBSD
 #
@@ -142,7 +142,7 @@ depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
 	MKDEP_CPP="${CPP}" ; export MKDEP_CPP ; \
 	mkdep -a -f .newdep -DLOCORE ${COPTS} ${SFILES} ${SYSTEM_SFILES}
 	rm -f .depend
-	mv .newdep .depend
+	mv -f .newdep .depend
 
 links:
 	egrep '#if' ${CFILES:Nswapkernel.c} | sed -f $S/conf/defines | \
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index 132ebbb..9c5ffd6 100644
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -1,6 +1,6 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.80 1996/05/02 14:19:35 phk Exp $
+#	$Id: Makefile.i386,v 1.81 1996/05/02 21:40:50 joerg Exp $
 #
 # Makefile for FreeBSD
 #
@@ -142,7 +142,7 @@ depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
 	MKDEP_CPP="${CPP}" ; export MKDEP_CPP ; \
 	mkdep -a -f .newdep -DLOCORE ${COPTS} ${SFILES} ${SYSTEM_SFILES}
 	rm -f .depend
-	mv .newdep .depend
+	mv -f .newdep .depend
 
 links:
 	egrep '#if' ${CFILES:Nswapkernel.c} | sed -f $S/conf/defines | \
diff --git a/sys/modules/atapi/Makefile b/sys/modules/atapi/Makefile
index b1d54ff..43125cf 100644
--- a/sys/modules/atapi/Makefile
+++ b/sys/modules/atapi/Makefile
@@ -1,3 +1,5 @@
+#	$Id: $
+
 .PATH:          ${.CURDIR}/../../sys/i386/isa
 KMOD            = atapi_mod
 SRCS            = atapi.c wdc.h #wcd.h
@@ -27,6 +29,6 @@ wcd.h:
 .c.o:
 		-@$(LN) /sys/i386/include machine
 		$(CC) $(CFLAGS) -c $<
-		-@rm machine
+		-@rm -f machine
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/wcd/Makefile b/sys/modules/wcd/Makefile
index 162de4b..d855075 100644
--- a/sys/modules/wcd/Makefile
+++ b/sys/modules/wcd/Makefile
@@ -1,3 +1,5 @@
+#	$Id: $
+
 .PATH:          ${.CURDIR}/../../sys/i386/isa
 KMOD            = wcd_mod
 SRCS            = wcd.c wdc.h wcd.h
@@ -23,6 +25,6 @@ wcd.h:
 .c.o:
 		-@$(LN) /sys/i386/include machine
 		$(CC) $(CFLAGS) -c $<
-		-@rm machine
+		-@rm -f machine
 
 .include <bsd.kmod.mk>
diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile
index 57e653b..f0d3883 100644
--- a/usr.bin/lex/Makefile
+++ b/usr.bin/lex/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 1994/08/27 09:52:30 csgr Exp $
+# $Id: Makefile,v 1.3 1996/01/08 09:17:39 peter Exp $
 #
 # By default, flex will be configured to generate 8-bit scanners only if the
 # -8 flag is given.  If you want it to always generate 8-bit scanners, add
@@ -37,8 +37,8 @@ beforeinstall:
 
 parse.c parse.h: parse.y
 	$(YACC) -d $(.CURDIR)/parse.y
-	mv y.tab.c parse.c
-	mv y.tab.h parse.h
+	mv -f y.tab.c parse.c
+	mv -f y.tab.h parse.h
 
 .if exists(/usr/bin/lex)
 scan.o:	parse.c
diff --git a/usr.sbin/amd/fsinfo/Makefile b/usr.sbin/amd/fsinfo/Makefile
index 2ae9344..8a216f5 100644
--- a/usr.sbin/amd/fsinfo/Makefile
+++ b/usr.sbin/amd/fsinfo/Makefile
@@ -1,4 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/28/93
+# 	$Id: $
 
 PROG=	fsinfo
 MAN8=	fsinfo.8
@@ -18,12 +19,12 @@ fsi_lex.o fsinfo.o: fsi_gram.h
 fsi_gram.c fsi_gram.h: ../fsinfo/fsi_gram.y
 	@echo "# expect 2 shift/reduce conflicts"
 	${YACC} -d ${.CURDIR}/fsi_gram.y
-	mv y.tab.c fsi_gram.c
-	mv y.tab.h fsi_gram.h
+	mv -f y.tab.c fsi_gram.c
+	mv -f y.tab.h fsi_gram.h
 
 fsi_lex.c: ../fsinfo/fsi_lex.l
 	${LEX} ${.CURDIR}/fsi_lex.l
-	mv lex.yy.c fsi_lex.c
+	mv -f lex.yy.c fsi_lex.c
 
 .PATH: ${.CURDIR}/../config
 .include "../../Makefile.inc"