From e8b193f10b816eca7e6e13a037569dc1a9ee6e44 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 6 Feb 2011 15:18:30 +0000 Subject: [PATCH] allow packages to override/extend PKG_CONFIG_PATH SVN-Revision: 25386 --- include/package.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/package.mk b/include/package.mk index 580774134c..e0d367abac 100644 --- a/include/package.mk +++ b/include/package.mk @@ -43,6 +43,7 @@ override MAKEFLAGS= CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME) CUR_MAKEFILE:=$(filter-out Makefile,$(firstword $(MAKEFILE_LIST))) SUBMAKE:=$(NO_TRACE_MAKE) $(if $(CUR_MAKEFILE),-f $(CUR_MAKEFILE)) +PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),) ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),) @@ -80,8 +81,8 @@ define Build/Exports/Default $(1) : export STAGING_PREFIX=$$(STAGING_DIR)/usr $(1) : export PATH=$$(TARGET_PATH_PKG) $(1) : export CONFIG_SITE:=$$(CONFIG_SITE) - $(1) : export PKG_CONFIG_PATH=$$(STAGING_DIR)/usr/lib/pkgconfig - $(1) : export PKG_CONFIG_LIBDIR=$$(STAGING_DIR)/usr/lib/pkgconfig + $(1) : export PKG_CONFIG_PATH=$$(PKG_CONFIG_PATH) + $(1) : export PKG_CONFIG_LIBDIR=$$(PKG_CONFIG_PATH) endef Build/Exports=$(Build/Exports/Default)