From 1fce0b2291c21d3410516c0ba6cef90faa1d6f7a Mon Sep 17 00:00:00 2001
From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Tue, 8 Jul 2008 11:10:06 +0100
Subject: [PATCH] Build system fixes for qemu

Use -include rather than include in several places, which makes make
clean from xen-unstable's build system work better.

Set prefix to /usr in xen-setup, as xen-unstable always targets /usr (!)
---
 Makefile.target     | 4 ++--
 xen-config-host.mak | 2 +-
 xen-setup           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index c288b872..39e72bc0 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -291,7 +291,7 @@ ifdef CONFIG_DYNGEN_OP
 OPC_H = gen-op.h dyngen-opc.h op.h
 endif
 
-include hookslib.mak
+-include hookslib.mak
 
 libqemu.a: $(LIBOBJS)
 	rm -f $@
@@ -683,7 +683,7 @@ LDFLAGS+=-p
 main.o: CFLAGS+=-p
 endif
 
-include hooks.mak
+-include hooks.mak
 all: $(PROGS)
 
 $(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a
diff --git a/xen-config-host.mak b/xen-config-host.mak
index 58ce0b18..ceacdcd9 100644
--- a/xen-config-host.mak
+++ b/xen-config-host.mak
@@ -4,4 +4,4 @@ include $(XEN_ROOT)/tools/Rules.mk
 
 TARGET_DIRS=i386-dm
 
-include $(QEMU_ROOT)/xen-hooks.mak
+-include $(QEMU_ROOT)/xen-hooks.mak
diff --git a/xen-setup b/xen-setup
index e80165ca..6b209360 100755
--- a/xen-setup
+++ b/xen-setup
@@ -7,7 +7,7 @@ rm -f $target/Makefile
 rm -f $target/config.mak
 rm -f config-host.mak
 
-./configure --disable-curses "$@"
+./configure --disable-curses "$@" --prefix=/usr
 
 target=i386-dm
 
-- 
2.39.5