aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-07-31 01:33:01 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-07-31 01:33:01 +0000
commita2c17f1bc53809a9d9d7dd7ce36c4eda8d1fcd1e (patch)
treefc15f1f04499f1a1d0836113295abc93ab83cd97 /include
parentcf2cd1c3846a3f640b0f0468814c3684a7eb71dd (diff)
downloadupstream-a2c17f1bc53809a9d9d7dd7ce36c4eda8d1fcd1e.tar.gz
upstream-a2c17f1bc53809a9d9d7dd7ce36c4eda8d1fcd1e.tar.bz2
upstream-a2c17f1bc53809a9d9d7dd7ce36c4eda8d1fcd1e.zip
export PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR by default (#3376)
SVN-Revision: 12029
Diffstat (limited to 'include')
-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 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