diff options
| author | jlam <jlam> | 2001-05-26 08:13:13 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-05-26 08:13:13 +0000 |
| commit | b1283d5ee8c23030f0531926bbcf72599cb104ba (patch) | |
| tree | 6a81d9b64dca40aadfe4df60abf55dd36be0265b /editors | |
| parent | 732f073b903aa9994c2eb19a553c84c23edbd688 (diff) | |
| download | pkgsrc-b1283d5ee8c23030f0531926bbcf72599cb104ba.tar.gz | |
Use buildlink.mk files to get libiconv and png dependencies, and, as a
result, remove unnecessary flags to search specific source directories
before ${LOCALBASE}/include for headers.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/abiword/Makefile | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 0a6d71432a7..f4feaa59773 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2001/05/24 04:28:19 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2001/05/26 08:13:13 jlam Exp $ # # According to AbiSource's explanation of their trademark rights, # compilations/distributions of AbiWord not provided by AbiSource must @@ -23,36 +23,29 @@ HOMEPAGE= http://www.abisource.com/ COMMENT= Open Source cross-platform word processor BUILD_DEPENDS+= unzip-*:../../archivers/unzip -DEPENDS+= libiconv>=1.5:../../converters/libiconv DEPENDS+= ispell-base-*:../../textproc/ispell-base DEPENDS+= gtk+-1.2.*:../../x11/gtk -DEPENDS+= png>=1.0.11:../../graphics/png USE_X11= # defined USE_XPM= # defined USE_GMAKE= # defined -NO_CONFIGURE= # defined ALL_TARGET= compile canonical +.include "../../converters/libiconv/buildlink.mk" +.include "../../graphics/png/buildlink.mk" + OS_CFLAGS= ${CFLAGS} +OS_CFLAGS+= -I${BUILDLINK_INCDIR} .if exists(/usr/include/inttypes.h) OS_CFLAGS+= -DHAVE_INTTYPE_H=1 .endif -# Avoid headers from some installed packages. These must come first before -# ${LOCALBASE}/include! -# -OS_CFLAGS+= -I${WRKDIR}/expat -OS_CFLAGS+= -I${WRKDIR}/psiconv -OS_CFLAGS+= -I${WRKDIR}/wv - -OS_CFLAGS+= -I${LOCALBASE}/include # png.h & iconv.h - # AbiWord expects the iconv functions to be in the system libraries, so # unconditionally link against the pkgsrc libiconv.so. # -XLDFLAGS= ${LDFLAGS} -liconv +XLDFLAGS= -L${BUILDLINK_LIBDIR} +XLDFLAGS+= ${LDFLAGS} -liconv MAKE_ENV+= OS_CFLAGS="${OS_CFLAGS}" MAKE_ENV+= XLDFLAGS="${XLDFLAGS}" @@ -65,6 +58,8 @@ WRKSRC= ${WRKDIR}/abi post-extract: ${RM} -rf ${WRKSRC}/user/wp/help/images/CVS +pre-configure: ${BUILDLINK_TARGETS} + post-install: ${CHMOD} -R a+r ${PREFIX}/share/AbiSuite ${RM} -f ${PREFIX}/share/AbiSuite/dictionary/american.hash |