From: Zhigang Wang Date: Tue, 20 May 2014 17:30:54 +0000 (-0400) Subject: tools: install qemu into xen private directory and add rpath for the libraries X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4931 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2fd0257fbf39305ea63afd784c74c7a3bbbcfa30;p=xen.git 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 Acked-by: Ian Campbell --- diff --git a/tools/Makefile b/tools/Makefile index 992fe3e8e8..63382b16e4 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 \