tools: prepend to PKG_CONFIG_PATH when configuring qemu

A user may choose to set his/her own PKG_CONFIG_PATH, which is useful in the
case of cross-compiling.  We don't want to completely override the
PKG_CONFIG_PATH, just add to it.

Signed-off-by: Stewart Hildebrand <stewart.hildebrand@dornerworks.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Release-acked-by: Juergen Gross <jgross@suse.com>
(cherry picked from commit 08641a9e8870d3b174d95aaa55ecba43387563b5)

diff --git a/tools/Makefile b/tools/Makefile
index ab7a01ee1bee116fa8dd623fad64ac45193f8345..67977ad850ab43b3dc8af68bc387f67be82f000a 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -232,7 +232,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
        else \
                enable_trace_backend='' ; \
        fi ; \
-       PKG_CONFIG_PATH=$(XEN_ROOT)/tools/pkg-config \
+       PKG_CONFIG_PATH=$(XEN_ROOT)/tools/pkg-config$${PKG_CONFIG_PATH:+:$${PKG_CONFIG_PATH}} \
        $$source/configure --enable-xen --target-list=i386-softmmu \
                $(QEMU_XEN_ENABLE_DEBUG) \
                $$enable_trace_backend \