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
---
 x11-toolkits/py-gtk2/Makefile | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'x11-toolkits/py-gtk2/Makefile')

diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index b50e25a52a65..53d07082d7a4 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -28,11 +28,11 @@ USE_GNOME=	gnomehack libglade2 pygobject
 USE_PYTHON=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-lintl" \
+CONFIGURE_ENV=	LIBS="-lintl" \
 		PYTHON="${PYTHON_VERSION}"
-CONFIGURE_ARGS=	--disable-docs
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--disable-docs
 
 DOCSDIR=	${PREFIX}/share/doc/py-gtk
 EG_SRC_DIR=	${WRKSRC}/examples
@@ -59,12 +59,9 @@ CONFIGURE_ARGS+=--disable-numpy
 .if !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--enable-thread
 CFLAGS+=		${PTHREAD_CFLAGS}
-CONFIGURE_ENV+=		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
+LDFLAGS+=		${PTHREAD_LIBS}
 .else
 CONFIGURE_ARGS+=	--disable-thread
-.if defined(LDFLAGS)
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
-.endif
 .endif
 
 post-install:
-- 
cgit v1.2.3