aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-02-06 15:18:30 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-02-06 15:18:30 +0000
commit9ee4a2204f1822106c0165b7d03b4b85e4ba1d6e (patch)
treeaaffb7b2c3cdc00b2b6aab3bcb4d901589183855
parent417391536896e1987a968f4bc321024ffa9541fe (diff)
downloadmaster-187ad058-9ee4a2204f1822106c0165b7d03b4b85e4ba1d6e.tar.gz
master-187ad058-9ee4a2204f1822106c0165b7d03b4b85e4ba1d6e.tar.bz2
master-187ad058-9ee4a2204f1822106c0165b7d03b4b85e4ba1d6e.zip
allow packages to override/extend PKG_CONFIG_PATH
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25386 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/package.mk5
1 files 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)