summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-07-31 01:33:01 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-07-31 01:33:01 +0000
commit36b99718212dde5ae1d17ec04268fbe24b72b1de (patch)
treee6ce1b95dc637a331dbd9061e100cd15b76e4fff
parent195d365bb1e06a2e1ae561f0b10febc1500d9874 (diff)
export PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR by default (#3376)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12029 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/package-defaults.mk7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index d8e8228ba..d72e02b1e 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -42,6 +42,9 @@ ifneq ($(strip $(PKG_UNPACK)),)
endef
endif
+export PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR_HOST)/usr/lib/pkgconfig
+export PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig
+
CONFIGURE_PREFIX:=/usr
CONFIGURE_ARGS = \
--target=$(GNU_TARGET_NAME) \
@@ -67,8 +70,8 @@ CONFIGURE_VARS = \
CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
- PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR_HOST)/usr/lib/pkgconfig" \
- PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig"
+ PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" \
+ PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"
CONFIGURE_PATH = .
CONFIGURE_CMD = ./configure