From ff06a061f1f7575eb0a2f84d24d649fb82528079 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 24 Sep 2006 02:09:45 +0000
Subject: [PATCH] add CXXFLAGS and PKG_CONFIG_PATH in Build/Configure/Default,
 add EXTRA_LDFLAGS in Build/Compile/Default, use consistent search order for
 includes in CFLAGS.

SVN-Revision: 4849
---
 openwrt/include/package.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/openwrt/include/package.mk b/openwrt/include/package.mk
index 396fae60f8..f7dbacc415 100644
--- a/openwrt/include/package.mk
+++ b/openwrt/include/package.mk
@@ -271,12 +271,14 @@ define Build/Prepare
 endef
 
 define Build/Configure/Default
-	@(cd $(PKG_BUILD_DIR)/$(3); \
+	(cd $(PKG_BUILD_DIR)/$(3); \
 	if [ -x configure ]; then \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
+		CXXFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
 		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
 		$(2) \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
@@ -308,7 +310,8 @@ define Build/Compile/Default
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CROSS="$(TARGET_CROSS)" \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \
+		EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include " \
+		EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib " \
 		ARCH="$(ARCH)" \
 		$(1);
 endef