diff options
| author | jlam <jlam> | 2001-06-11 02:05:07 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-06-11 02:05:07 +0000 |
| commit | 1c173ba8e2deca49b126f8bd939dadf46f3be360 (patch) | |
| tree | 8a4903fb4961ac3e5118ca00c446b0bcfea9697d /editors | |
| parent | fd9688151b15b136e8bb62a77ec3f4c6abf839da (diff) | |
| download | pkgsrc-1c173ba8e2deca49b126f8bd939dadf46f3be360.tar.gz | |
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.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/abiword/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
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}" |