[Xen-changelog] [xen master] tools: install qemu into xen private directory and add rpath for the libraries

[patchbot@xxxxxxx]

commit 2fd0257fbf39305ea63afd784c74c7a3bbbcfa30
Author:     Zhigang Wang <zhigang.x.wang@xxxxxxxxxx>
AuthorDate: Tue May 20 13:30:54 2014 -0400
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Mon Jun 2 14:45:26 2014 +0100

    tools: install qemu into xen private directory and add rpath for the 
libraries
    
    This patch will prevent our qemu from conflicting with system qemu.
    
    Signed-off-by: Zhigang Wang <zhigang.x.wang@xxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 tools/Makefile |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/Makefile b/tools/Makefile
index 992fe3e..63382b1 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -187,7 +187,9 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
        cd qemu-xen-dir; \
        $$source/configure --enable-xen --target-list=i386-softmmu \
                $(QEMU_XEN_ENABLE_DEBUG) \
-               --prefix=$(PREFIX) \
+               --prefix=$(PREFIX)/lib/xen \
+               --libdir=$(PREFIX)/lib/xen/lib \
+               --includedir=$(PREFIX)/lib/xen/include \
                --source-path=$$source \
                --extra-cflags="-I$(XEN_ROOT)/tools/include \
                -I$(XEN_ROOT)/tools/libxc \
@@ -195,7 +197,8 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
                -I$(XEN_ROOT)/tools/xenstore/compat \
                $(EXTRA_CFLAGS_QEMU_XEN)" \
                --extra-ldflags="-L$(XEN_ROOT)/tools/libxc \
-               -L$(XEN_ROOT)/tools/xenstore" \
+               -L$(XEN_ROOT)/tools/xenstore \
+               -Wl,-rpath=$(PREFIX)/lib/xen/lib" \
                --bindir=$(LIBEXEC) \
                --datadir=$(SHAREDIR)/qemu-xen \
                --localstatedir=/var \
--
generated by git-patchbot for /home/xen/git/xen.git#master

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