summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-02-06 15:18:30 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-02-06 15:18:30 +0000
commit81f2848a66d19a82bdc14e0f8297f52d85e6fd0c (patch)
treeaaffb7b2c3cdc00b2b6aab3bcb4d901589183855 /include
parente9bbf87061387c97f75dcecca42678ea01062b52 (diff)
allow packages to override/extend PKG_CONFIG_PATH
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25386 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
-rw-r--r--include/package.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/package.mk b/include/package.mk
index 580774134..e0d367aba 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)