From 5bca9c87d6eee9902f0ebedec9633f20f2b4a062 Mon Sep 17 00:00:00 2001
From: Mirko Vogt <mirko@openwrt.org>
Date: Tue, 22 Feb 2011 12:12:48 +0000
Subject: [PATCH] [packages/qt4] some Qt-internal paths are magically getting
 appended to TARGET_{INC,LIB}DIRS - however _only_ to the very last element
 (so the last elem should be the staging-dir - not the toolchain-dir)

thanks to kyak for pointing this out!

SVN-Revision: 25658
---
 Xorg/lib/qt4/files/qmake.mk | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/Xorg/lib/qt4/files/qmake.mk b/Xorg/lib/qt4/files/qmake.mk
index 96ec2a7e89..f6da5820be 100644
--- a/Xorg/lib/qt4/files/qmake.mk
+++ b/Xorg/lib/qt4/files/qmake.mk
@@ -8,8 +8,17 @@
 QMAKE_PLATFORM_PREFIX:=$(if $(CONFIG_QT4_WS_QWS),qws/)
 QMAKE_SPECFILE:=$(STAGING_DIR)/usr/share/mkspecs/$(QMAKE_PLATFORM_PREFIX)linux-openwrt-g++
 
-TARGET_INCDIRS+=$(STAGING_DIR)/include $(STAGING_DIR)/usr/include $(TOOLCHAIN_DIR)/include $(TOOLCHAIN_DIR)/usr/include
-TARGET_LIBDIRS+=$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib $(TOOLCHAIN_DIR)/lib $(TOOLCHAIN_DIR)/usr/lib
+TARGET_INCDIRS +=\
+	$(TOOLCHAIN_DIR)/include \
+	$(STAGING_DIR)/include \
+	$(TOOLCHAIN_DIR)/usr/include \
+	$(STAGING_DIR)/usr/include
+
+TARGET_LIBDIRS += \
+	$(TOOLCHAIN_DIR)/lib \
+	$(STAGING_DIR)/lib \
+	$(TOOLCHAIN_DIR)/usr/lib \
+	$(STAGING_DIR)/usr/lib 
 
 define Build/Configure/Qmake
 	TARGET_CC="$(TARGET_CROSS)gcc" \
-- 
2.30.2