Find XEN_ROOT more properly

diff --git a/xen-config-host.mak b/xen-config-host.mak
index 696b269f57fd60186dcb346f8c4b69fb036c7459..9253840e4e9446ded6c03c1d757d2d7435755054 100644 (file)
--- a/xen-config-host.mak
+++ b/xen-config-host.mak
@@ -1,15 +1,12 @@
-XEN_ROOT ?= ../..
-include $(XEN_ROOT)/tools/Rules.mk
-
+# Automatically generated by configure - do not modify
+# Configured with: ./configure 
+prefix=/usr/local
+bindir=${prefix}/bin
+mandir=${prefix}/share/man
+datadir=${prefix}/share/qemu
+docdir=${prefix}/share/doc/qemu
 MAKE=make
-INSTALL=install -c
-
-prefix=$(PREFIX)
-bindir=$(prefix)/bin
-mandir=$(prefix)/share/man
-datadir=$(prefix)/share/qemu
-docdir=$(prefix)/share/doc/qemu
-
+INSTALL=install
 CC=gcc-3.4
 HOST_CC=gcc
 AR=ar
@@ -31,7 +28,7 @@ CONFIG_VNC_TLS_CFLAGS=
 CONFIG_VNC_TLS_LIBS=-lgnutls  
 VERSION=0.9.1
 SRC_PATH=/u/iwj/work/qemu-iwj.git
-
+TARGET_DIRS=i386-softmmu x86_64-softmmu arm-softmmu cris-softmmu m68k-softmmu mips-softmmu mipsel-softmmu mips64-softmmu mips64el-softmmu ppc-softmmu ppcemb-softmmu ppc64-softmmu sh4-softmmu sh4eb-softmmu sparc-softmmu i386-linux-user x86_64-linux-user alpha-linux-user arm-linux-user armeb-linux-user cris-linux-user m68k-linux-user mips-linux-user mipsel-linux-user ppc-linux-user ppc64-linux-user ppc64abi32-linux-user sh4-linux-user sh4eb-linux-user sparc-linux-user sparc64-linux-user sparc32plus-linux-user 
 BUILD_DOCS=yes
 CONFIG_SDL=yes
 SDL_LIBS=-L/usr/lib -lSDL
@@ -39,5 +36,3 @@ SDL_CFLAGS=-I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
 CONFIG_CURSES=yes
 CURSES_LIBS=-lcurses
 TOOLS=qemu-img$(EXESUF) 
-
-TARGET_DIRS = i386-dm i386-stubdom

diff --git a/xen-config.mak b/xen-config.mak
index 6d99287f1d348f11b9e1e26ef66db9deda35dada..aa0101c969b9aaa0df7a7294cc721a937d0c495e 100644 (file)
--- a/xen-config.mak
+++ b/xen-config.mak
@@ -1,3 +1,3 @@
 include ../config-host.mak
-XEN_ROOT ?= ../../..
+XEN_ROOT ?= ../../xen-unstable.hg
 include $(XEN_ROOT)/tools/Rules.mk