commit e6171e9954901bad7bd118d9c27a030d980a866f Author: Zhigang Wang Date: Tue May 20 13:30:54 2014 -0400 tools: install qemu libraries to xen private directory and add rpath to it This patch will prevent our qemu libraries from conflicting with system qemu libraries. Signed-off-by: Zhigang Wang 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 \