projects
/
openwrt
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
996d4de
)
allow packages to override/extend PKG_CONFIG_PATH
author
Felix Fietkau
<nbd@openwrt.org>
Sun, 6 Feb 2011 15:18:30 +0000
(15:18 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Sun, 6 Feb 2011 15:18:30 +0000
(15:18 +0000)
SVN-Revision: 25386
include/package.mk
patch
|
blob
|
history
diff --git
a/include/package.mk
b/include/package.mk
index 580774134c916c4aff3fad0040a90881c4fa0aa6..e0d367abac48ee7f1f441a1c8d1740ddd1e8b494 100644
(file)
--- 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))
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)),)
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 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)
endef
Build/Exports=$(Build/Exports/Default)