From 93055d4e3e6dc7311cb19a6d0a6734d87e4eb559 Mon Sep 17 00:00:00 2001 From: Juergen Gross Date: Tue, 14 Mar 2017 14:31:10 +0100 Subject: [PATCH] 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 Acked-by: Wei Liu --- stubdom/Makefile | 1 + tools/Makefile | 3 +++ tools/libxc/Makefile | 1 - 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/stubdom/Makefile b/stubdom/Makefile index c6458e81a6..54a2bdda0e 100644 --- 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 85e5ce96b3..828ee34b84 100644 --- 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 a161ba71bd..b15736cf85 100644 --- 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 -- 2.30.2