From 6f6fbe4bdf9851de1eb6ebef5287e3007846045e Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Fri, 23 Sep 2011 22:26:39 +0000
Subject: - Add LDFLAGS to CONFIGURE_ENV and MAKE_ENV (as it was done with
 LDFLAGS) - Fix all ports that add {CPP,LD}FLAGS to *_ENV to modify flags
 instead

PR:		157936
Submitted by:	myself
Exp-runs by:	pav
Approved by:	pav
---
 Mk/bsd.qt.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Mk/bsd.qt.mk')

diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk
index ecb58b5acb89..63711d604a59 100644
--- a/Mk/bsd.qt.mk
+++ b/Mk/bsd.qt.mk
@@ -25,8 +25,9 @@ CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \
 		--with-qt-libraries=${QT_LIBDIR} \
 		--with-extra-libs=${LOCALBASE}/lib \
 		--with-extra-includes=${LOCALBASE}/include
-CONFIGURE_ENV+=	MOC="${MOC}" UIC="${UIC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
+CONFIGURE_ENV+=	MOC="${MOC}" UIC="${UIC}" LIBS="${QTCFGLIBS}" \
 		QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" QTDIR="${QT_PREFIX}"
+CPPFLAGS+=	${QTCPPFLAGS}
 MAKE_ENV+=	QMAKESPEC="${QMAKESPEC}"
 .endif # !defined(QT_NONSTANDARD)
 
-- 
cgit v1.2.3