From: Felix Fietkau <nbd@openwrt.org>
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.lede-project.org./?a=commitdiff_plain;h=a2c17f1bc53809a9d9d7dd7ce36c4eda8d1fcd1e;p=openwrt%2Fstaging%2Fjow.git

export PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR by default (#3376)

SVN-Revision: 12029
---

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index d8e8228baf..d72e02b1e0 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