# HG changeset patch
# User iap10@labyrinth.cl.cam.ac.uk
# Date 1106619944 0
# Node ID 89da70a626a71e1a855146b5c760189000f3f87e
# Parent  074d7606fd615ee91519caeff88079d300ea5c14# Parent  97f37454c64ef82da553d256a30f0a0eb80f41d5
bitkeeper revision 1.1159.212.35 (41f5ae28rGX5ZRYjiv0VTWqCmka9oA)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk


diff -r 074d7606fd61 -r 89da70a626a7 xen/Makefile
--- a/xen/Makefile	Tue Jan 25 01:36:09 2005 +0000
+++ b/xen/Makefile	Tue Jan 25 02:25:44 2005 +0000
@@ -68,7 +68,7 @@ include/xen/compile.h: include/xen/compi
 	    -e 's!@@changeset@@!$(shell bk changes -nd':D: :T: :REV: :MD5KEY:' -r+ 2>/dev/null || echo information unavailable)!g' \
 	    < include/xen/compile.h.in > $@.new
 	cat include/xen/banner.h >> $@.new
-	mv $@.new $@
+	mv -f $@.new $@
 
 tools/figlet/figlet: tools/figlet/figlet.o
 	$(CC) -o $@ $<
@@ -77,7 +77,7 @@ tools/figlet/figlet.o: tools/figlet/figl
 
 include/xen/banner.h: tools/figlet/figlet tools/figlet/xen.flf
 	tools/figlet/figlet -d tools/figlet Xen $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) > $@.new
-	mv $@.new $@
+	mv -f $@.new $@
 
 include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s
 	@(set -e; \