tools,stubdom: set PKG_CONFIG_DIR in main Makefiles

Instead of setting the PKG_CONFIG_DIR make variable in each library
Makefile do it in tools/Makefile and stubdom/Makefile globally.

Signed-off-by: Juergen Gross <jgross@suse.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>

diff --git a/stubdom/Makefile b/stubdom/Makefile
index c6458e81a697988efda514ca26ecc22c7231001d..54a2bdda0ecec47b63b9a3d3203d8dccdfc29083 100644 (file)
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -3,6 +3,7 @@ MINI_OS = $(XEN_ROOT)/extras/mini-os
 
 export XEN_ROOT
 export XEN_OS=MiniOS
+export PKG_CONFIG_DIR = $(CURDIR)/pkg-config
 
 # Remove flags which are meant for tools, e.g. "-m64"
 export EXTRA_CFLAGS_XEN_TOOLS=

diff --git a/tools/Makefile b/tools/Makefile
index 85e5ce96b3ee45d4308396c4ac25fafdceb4caa6..828ee34b848a7bb6d664567d844c76736911bfc4 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,4 +1,7 @@
 XEN_ROOT = $(CURDIR)/..
+
+export PKG_CONFIG_DIR = $(CURDIR)/pkg-config
+
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS-y :=

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index a161ba71bda374e67cd67348da9fca424fb062ba..b15736cf8590130b1b09366a29bfd8186f6b4606 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -1,5 +1,4 @@
 XEN_ROOT = $(CURDIR)/../..
-PKG_CONFIG_DIR = ../pkg-config
 include $(XEN_ROOT)/tools/Rules.mk
 
 MAJOR    = 4.9