diff options
| author | jlam <jlam@pkgsrc.org> | 2001-06-11 06:34:17 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-06-11 06:34:17 +0000 |
| commit | c4e71c5e7a56600bcceba68cbed656ef7246e444 (patch) | |
| tree | 6b373d2a314b8d27a2d1f47c4cb173dc5c0d7a48 /converters | |
| parent | a057ade2a392070aecc8ee511ae1cab01869b513 (diff) | |
| download | pkgsrc-c4e71c5e7a56600bcceba68cbed656ef7246e444.tar.gz | |
CPPFLAGS is now passed to MAKE_ENV and CONFIGURE_ENV by bsd.pkg.mk, so
adapt by moving CPPFLAGS settings to top-level, and removing explicit
inclusion of CPPFLAGS into MAKE_ENV and CONFIGURE_ENV.
Diffstat (limited to 'converters')
| -rw-r--r-- | converters/psiconv/Makefile | 6 | ||||
| -rw-r--r-- | converters/wv/Makefile | 4 | ||||
| -rw-r--r-- | converters/xdeview/Makefile | 7 |
3 files changed, 7 insertions, 10 deletions
diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile index 24399d7770a..e7b181c3f99 100644 --- a/converters/psiconv/Makefile +++ b/converters/psiconv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/02/25 04:17:39 hubertf Exp $ +# $NetBSD: Makefile,v 1.9 2001/06/11 06:34:22 jlam Exp $ # DISTNAME= psiconv-0.6.1 @@ -21,8 +21,8 @@ USE_X11= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig GNU_CONFIGURE= YES -CONFIGURE_ENV+= CPPFLAGS="`${MAGICK_CONFIG} --cppflags` -DIMAGEMAGICK" \ - LIBS="${LIBS} `${MAGICK_CONFIG} --libs`" +CONFIGURE_ENV+= LIBS="${LIBS} `${MAGICK_CONFIG} --libs`" +CPPFLAGS+= `${MAGICK_CONFIG} --cppflags` -DIMAGEMAGICK" post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/psiconv diff --git a/converters/wv/Makefile b/converters/wv/Makefile index 0d2c182b668..9ced6ad5754 100644 --- a/converters/wv/Makefile +++ b/converters/wv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/02/16 13:59:31 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2001/06/11 06:34:23 jlam Exp $ # DISTNAME= wv-0.6.0 @@ -27,13 +27,11 @@ CONFIGURE_ARGS+= --with-png=${LOCALBASE} CONFIGURE_ARGS+= --with-ttf=${LOCALBASE} CONFIGURE_ARGS+= --with-wmf=${LOCALBASE} CONFIGURE_ARGS+= --with-xpm=${XPMDIR} -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" MAKE_ENV+= RM="${RM} -f" CPPFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include/magick CPPFLAGS+= -I${LOCALBASE}/include/libwmf -MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" pre-patch: ${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} {} \; diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile index 1bf0d7a04d4..09092bc5f7c 100644 --- a/converters/xdeview/Makefile +++ b/converters/xdeview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2001/06/10 17:41:01 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2001/06/11 06:34:23 jlam Exp $ # DISTNAME= uudeview-0.5.15 @@ -17,9 +17,8 @@ USE_X11BASE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-tcl="${LOCALBASE}" --enable-tk="${LOCALBASE}" # Season to taste --- anything over tcl7.5 -CONFIGURE_ENV= LDFLAGS=-s\ - CPPFLAGS="-I${LOCALBASE}/include/ \ - -I${LOCALBASE}/include/" +LDFLAGS+= -s +CPPFLAGS+= -I${LOCALBASE}/include ALL_TARGET= xdeview INSTALL_TARGET= install-tcl |