Clean up commands for staging rules.

diff --git a/v7/src/Makefile.std b/v7/src/Makefile.std
index 12624ca8ab2590c49e29ddda89c5a33decefb71a..61b5ada67a426b4f5ece022cc8ffeaa7cc589c5b 100644 (file)
--- a/v7/src/Makefile.std
+++ b/v7/src/Makefile.std
@@ -1,4 +1,4 @@
-# $Id: Makefile.std,v 1.3 2000/12/05 22:33:33 cph Exp $
+# $Id: Makefile.std,v 1.4 2000/12/05 22:35:09 cph Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -35,55 +35,49 @@ tags TAGS:
        etags *.scm
 
 stage1:
-       mkdir STAGE1
-       mv *.com *.bci STAGE1/.
+       mkdir STAGE1 && mv -f *.com *.bci STAGE1/.
 
 unstage1:
-       mv STAGE1/* .
-       rmdir STAGE1
+       mv -f STAGE1/* . && rmdir STAGE1
 
 rmstage1:
        rm -rf STAGE1
 
 cpstage1:
-       cpx STAGE1/* .
+       cp -p STAGE1/* .
 
 lnstage1:
-       ln STAGE1/* .
+       ln -f STAGE1/* .
 
 stage2:
-       mkdir STAGE2
-       mv *.com *.bci STAGE2/.
+       mkdir STAGE2 && mv -f *.com *.bci STAGE2/.
 
 unstage2:
-       mv STAGE2/* .
-       rmdir STAGE2
+       mv -f STAGE2/* . && rmdir STAGE2
 
 rmstage2:
        rm -rf STAGE2
 
 cpstage2:
-       cpx STAGE2/* .
+       cp -p STAGE2/* .
 
 lnstage2:
-       ln STAGE2/* .
+       ln -f STAGE2/* .
 
 stage3:
-       mkdir STAGE3
-       mv *.com *.bci STAGE3/.
+       mkdir STAGE3 && mv -f *.com *.bci STAGE3/.
 
 unstage3:
-       mv STAGE3/* .
-       rmdir STAGE3
+       mv -f STAGE3/* . && rmdir STAGE3
 
 rmstage3:
        rm -rf STAGE3
 
 cpstage3:
-       cpx STAGE3/* .
+       cp -p STAGE3/* .
 
 lnstage3:
-       ln STAGE3/* .
+       ln -f STAGE3/* .
 
 .PHONY: all setup tags TAGS
 .PHONY: stage1 unstage1 rmstage1 cpstage1 lnstage1