X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=include%2Fpackage-defaults.mk;h=d72e02b1e0cf278575ebbf6fcc925fc9283b49f5;hb=9d9ce452b394f978f60e1efc4983e29d0790f648;hp=d8e8228bafb47827e828b594fff98a447621e826;hpb=0c19606e740aa15daaaa38e14b2173a4ac114221;p=15.05%2Fopenwrt.git 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