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

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

13 files changed, 61 insertions, 44 deletions

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>