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
---
 irc/xchat/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'irc/xchat/Makefile')

diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
index 73b70d1b7862..a1a5f7f9c763 100644
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@@ -25,8 +25,8 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehack gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 CONFIGURE_ARGS=	--enable-ipv6
 WANT_PERL=	yes
 
@@ -103,10 +103,10 @@ PLIST_SUB+=	PYTHON="@comment "
 USE_TCL=	84+
 .include "${PORTSDIR}/Mk/bsd.tcl.mk"
 CONFIGURE_ARGS+=--enable-tcl=${TCL_LIBDIR}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
-		-I${TCL_INCLUDEDIR}" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
 		-L${TCL_LIBDIR}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
+		-I${TCL_INCLUDEDIR}
 PLIST_SUB+=	TCL=""
 .else
 CONFIGURE_ARGS+=--enable-tcl=no
-- 
cgit v1.2.3