From 1c173ba8e2deca49b126f8bd939dadf46f3be360 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Mon, 11 Jun 2001 02:05:07 +0000
Subject: The buildlink include and lib directories are added to CFLAGS,
 CPPFLAGS, CXXFLAGS, and LDFLAGS by the buildlink.mk files so remove the extra
 definitions to add them from the package Makefiles.  As advised by the
 bsd.buildlink.mk file, also ensure that the buildlink.mk files are included
 prior to defining any package-specific CFLAGS/LDFLAGS to ensure that the
 buildlink directories are at the head of the compiler search paths.

---
 editors/abiword/Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'editors')

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 124d358e2cf..c2f817dd866 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2001/06/10 00:08:44 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2001/06/11 02:05:10 jlam Exp $
 #
 # According to AbiSource's explanation of their trademark rights,
 # compilations/distributions of AbiWord not provided by AbiSource must
@@ -35,7 +35,7 @@ ALL_TARGET=	compile canonical
 .include "../../graphics/png/buildlink.mk"
 
 OS_CFLAGS=	${CFLAGS}
-OS_CFLAGS+=	-I${BUILDLINK_INCDIR}
+OS_CFLAGS+=	${BUILDLINK_CPPFLAGS}
 
 .if exists(/usr/include/inttypes.h)
 OS_CFLAGS+=	-DHAVE_INTTYPE_H=1
@@ -44,8 +44,7 @@ OS_CFLAGS+=	-DHAVE_INTTYPE_H=1
 # AbiWord expects the iconv functions to be in the system libraries, so
 # unconditionally link against the pkgsrc libiconv.so.
 #
-XLDFLAGS=	-L${BUILDLINK_LIBDIR}
-XLDFLAGS+=	${LDFLAGS} -liconv
+XLDFLAGS=	${LDFLAGS} -liconv
 
 MAKE_ENV+=	OS_CFLAGS="${OS_CFLAGS}"
 MAKE_ENV+=	XLDFLAGS="${XLDFLAGS}"
-- 
cgit v1.2.3