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 (!)

diff --git a/Makefile.target b/Makefile.target
index c288b8725e9129b033e916ce4b2120d98c929666..39e72bc0dc850c752e90408c9bba6bf514f6c39f 100644 (file)
--- 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 58ce0b186db34239cce17580e20e2994ac24f499..ceacdcd94e9ce98a8a5eb283ead8193d2f0ead12 100644 (file)
--- 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 e80165cad391aacb0b6ffc45b2b93ce35ce4b96e..6b2093606b971401d04d7d9ef2ccf884a314b3ca 100755 (executable)
--- 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