# HG changeset patch
# User yamahata@xxxxxxxxxxxxx
# Node ID 3b1515c9de202888ae95a8359a8373d6ee3669f7
# Parent  d75a6cc5e68abe8541c326afa2a614bf1973c609
make linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre robust a bit.
PATCHNAME: xen-mkbuildtree-pre_ia64

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff -r d75a6cc5e68a -r 3b1515c9de20 linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre
--- a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre	Tue Mar 28 08:54:58 2006 -0700
+++ b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre	Wed Mar 29 11:24:34 2006 +0900
@@ -6,21 +6,31 @@
 # for building (as all files in mv'd directories are thought by hg
 # to have been deleted).  I don't know how to avoid this right now,
 # but if someone has a better way, I'm all ears
-if [ ! -e mm.xen-x86 ]
-then
-	mv mm mm.xen-x86
-	mkdir mm
-	mv net net.xen-x86
-	mv kernel kernel.xen-x86
-	mv drivers/acpi/tables.c drivers/acpi/tables.c.xen-x86
-#	mv arch/xen/kernel drivers/xen/core
-#	mv arch/xen arch/xen.xen-x86
-#	mkdir arch/xen
-#	mv arch/xen.xen-x86/configs arch/xen
-#	mv include/asm-generic include/asm-generic.xen-x86
-	mv include/linux include/linux.xen-x86
-	mkdir include/linux
-fi
+
+function try_to_mv() {
+	if [ ! -e $2 ]
+	then
+		mv $1 $2
+	fi
+}
+
+function try_to_mkdir() {
+	if [ ! -e $2 ]
+	then
+		mv $1 $2
+		mkdir $1
+	fi
+}
+
+try_to_mkdir mm mm.xen-x86
+try_to_mv net net.xen-x86
+try_to_mv kernel kernel.xen-x86
+try_to_mv drivers/acpi/tables.c drivers/acpi/tables.c.xen-x86
+#try_to_mv arch/xen/kernel drivers/xen/core
+#try_to_mkdir arch/xen arch/xen.xen-x86
+#try_to_mv arch/xen.xen-x86/configs arch/xen
+#try_to_mv include/asm-generic include/asm-generic.xen-x86
+try_to_mkdir include/linux include/linux.xen-x86
 
 # need to grab a couple of xen-modified files for generic_page_range and
 # typedef pte_fn_t which are used by driver/xen blkif