Makefile: include (in /usr/local) the upstream QEMU build.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/root_image/Makefile b/root_image/Makefile
index edf30c4ab9aa9959c3a2042ec4a7d4180af13808..1d296ff1f3c5cefe89fc74345725b08b913d97e8 100644 (file)
--- a/root_image/Makefile
+++ b/root_image/Makefile
@@ -192,7 +192,8 @@ root_image-userspace-install: $(USERSPACE_INSTALL) add-libs add-bins add-debug-b
        tools-install wget-install vim-install rsync-install openssh-install \
        xtt-tools-install netperf-install lvm2-install \
        pciutils-install iscsi-install bridge-utils-install xend-install \
-       perl-core nfs-install fio-install  irqbalance-install
+       perl-core nfs-install fio-install  irqbalance-install \
+       qemu-install
 
        rm -rf userspace/man
        rm -rf userspace/usr/share/man
@@ -1061,7 +1062,7 @@ qemu-install: userspace-prep
                if ! [ -e qemu/config.h ]; then \
                                (cd qemu;./configure --enable-vhost-net --enable-kvm --disable-xen \
                                 --disable-curses --disable-slirp --disable-opengl --disable-sdl \
-                               --disable-vnc-sasl  --disable-vnc-tls --prefix=/usr/kvm \
+                               --disable-vnc-sasl --disable-gtk --prefix=/usr/local \
                                --target-list=$(ARCH)-softmmu); \
                                echo "#include \"config-host.h\"" > qemu/config.h; \
                                echo "#include \"config-target.h\"" >> qemu/config.h; \