ia64/xen-unstable

changeset 5238:f85f27fa69ff

bitkeeper revision 1.1615.1.2 (429c8826fS2FuIKb-STmuvL0Hl6awQ)

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@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Tue May 31 15:52:06 2005 +0000 (2005-05-31)
parents 6ab1fc3f5598
children 990f147203ec
files tools/ioemu/configure tools/ioemu/target-i386-dm/Makefile
line diff
     1.1 --- a/tools/ioemu/configure	Tue May 31 15:39:28 2005 +0000
     1.2 +++ b/tools/ioemu/configure	Tue May 31 15:52:06 2005 +0000
     1.3 @@ -338,7 +338,7 @@ if test -z "$prefix" ; then
     1.4      prefix="usr/local"
     1.5  fi
     1.6  mandir="$installroot/$prefix/share/man"
     1.7 -datadir="$installroot/$prefix/share/qemu"
     1.8 +datadir="$installroot/$prefix/share/xen/qemu"
     1.9  docdir="$installroot/$prefix/share/doc/qemu"
    1.10  bindir="$installroot/$prefix/bin"
    1.11  configdir="$installroot/etc/xen"
     2.1 --- a/tools/ioemu/target-i386-dm/Makefile	Tue May 31 15:39:28 2005 +0000
     2.2 +++ b/tools/ioemu/target-i386-dm/Makefile	Tue May 31 15:52:06 2005 +0000
     2.3 @@ -304,7 +304,9 @@ VL_LDFLAGS=
     2.4  ifdef CONFIG_STATIC
     2.5  VL_LDFLAGS+=-static
     2.6  endif
     2.7 +ifeq ($(XEN_TARGET_ARCH),x86_32)
     2.8  VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(XEN_TARGET_ARCH).ld
     2.9 +endif
    2.10  ifndef CONFIG_DARWIN
    2.11  ifndef CONFIG_WIN32
    2.12  VL_LIBS=-lutil