[Xen-changelog] ioemu fixes: do not install into /usr/share/qemu as it conflicts with

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1617, 2005/05/31 16:52:06+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        ioemu fixes: do not install into /usr/share/qemu as it conflicts with
        real qemu installations. Also, do not link x86/64 with a special linker
        script -- breaks on SLES9 and ought to be unnecessary.
        The linker scripts and configuration/Makefile environment all need
        stripping out at some point.
        Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>



 configure               |    2 +-
 target-i386-dm/Makefile |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)


diff -Nru a/tools/ioemu/configure b/tools/ioemu/configure
--- a/tools/ioemu/configure     2005-05-31 12:04:07 -04:00
+++ b/tools/ioemu/configure     2005-05-31 12:04:07 -04:00
@@ -338,7 +338,7 @@
     prefix="usr/local"
 fi
 mandir="$installroot/$prefix/share/man"
-datadir="$installroot/$prefix/share/qemu"
+datadir="$installroot/$prefix/share/xen/qemu"
 docdir="$installroot/$prefix/share/doc/qemu"
 bindir="$installroot/$prefix/bin"
 configdir="$installroot/etc/xen"
diff -Nru a/tools/ioemu/target-i386-dm/Makefile 
b/tools/ioemu/target-i386-dm/Makefile
--- a/tools/ioemu/target-i386-dm/Makefile       2005-05-31 12:04:07 -04:00
+++ b/tools/ioemu/target-i386-dm/Makefile       2005-05-31 12:04:07 -04:00
@@ -304,7 +304,9 @@
 ifdef CONFIG_STATIC
 VL_LDFLAGS+=-static
 endif
+ifeq ($(XEN_TARGET_ARCH),x86_32)
 VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(XEN_TARGET_ARCH).ld
+endif
 ifndef CONFIG_DARWIN
 ifndef CONFIG_WIN32
 VL_LIBS=-lutil

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog