From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 31 Jul 2008 01:33:01 +0000 (+0000)
Subject: export PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR by default (#3376)
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=36b99718212dde5ae1d17ec04268fbe24b72b1de

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
---

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