summaryrefslogtreecommitdiff
path: root/converters/wv
diff options
context:
space:
mode:
authorjlam <jlam>2001-06-11 06:34:17 +0000
committerjlam <jlam>2001-06-11 06:34:17 +0000
commit01b416b8957e91c09a5635c805d763d5b74e4b31 (patch)
tree6b373d2a314b8d27a2d1f47c4cb173dc5c0d7a48 /converters/wv
parent26569759863a8ddd7fa067f67fc02d52b894a43b (diff)
downloadpkgsrc-01b416b8957e91c09a5635c805d763d5b74e4b31.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/wv')
-rw-r--r--converters/wv/Makefile4
1 files changed, 1 insertions, 3 deletions
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} {} \;