From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Tue, 17 Jun 2008 15:34:22 +0000 (+0100)
Subject: Change install paths to /usr/share/xen for Xen build
X-Git-Tag: xen-3.3.0-rc1~71
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5213ad5248f64363fba278d7c49d04a2da26554a;p=qemu-xen-3.3-testing.git

Change install paths to /usr/share/xen for Xen build
---

diff --git a/.gitignore b/.gitignore
index 3fc83b3c..613216c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,6 @@ qemu-img
 i386-dm/Makefile
 i386-dm/config.mak
 i386-dm/qemu-dm
+qemu-img-xen
+dyngen-xen
+dist
diff --git a/xen-hooks.mak b/xen-hooks.mak
index 45d92ba6..ec3a1df7 100644
--- a/xen-hooks.mak
+++ b/xen-hooks.mak
@@ -40,3 +40,9 @@ BAD_OBJS += gdbstub.o acpi.o apic.o
 BAD_OBJS += vmmouse.o vmport.o tcg* helper.o
 
 OBJS := $(filter-out $(BAD_OBJS), $(OBJS))
+
+EXESUF=-xen
+
+datadir := $(subst qemu,xen/qemu,$(datadir))
+docdir :=  $(subst qemu,xen/qemu,$(docdir))
+mandir :=  $(subst share/man,share/xen/man,$(mandir))
diff --git a/xen-setup b/xen-setup
index 1f52b42d..f7353202 100755
--- a/xen-setup
+++ b/xen-setup
@@ -1,16 +1,21 @@
 #!/bin/sh
 set -e
-if [ $# != 0 ]; then echo >&2 "usage: $0"; exit 1; fi
+
+# git-clean -x -d && ./xen-setup && make prefix=/usr CMDLINE_CFLAGS='-O0 -g' -j4 && make install DESTDIR=`pwd`/dist/ prefix=/usr && rsync -a --stats --delete . thule:shadow/qemu-iwj.git/ && rsync -a --stats dist/. root@thule:/
 
 rm -f $target/Makefile
 rm -f $target/config.mak
 rm -f config-host.mak
 
-./configure --disable-curses
+./configure --disable-curses "$@"
+
 
 target=i386-dm
 
 ln -sf ../Makefile.target $target/Makefile
 ln -sf ../xen-config.mak $target/config.mak
 cat xen-config-host.mak >>config-host.mak
-echo '#include "xen-config-host.h"' >>config-host.h
+
+sed -e 's,qemu,xen/qemu,' config-host.h >config-host.h.new
+echo '#include "xen-config-host.h"' >>config-host.h.new
+mv config-host.h.new config-host.h