summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-03-10 17:58:22 +0000
committerjlam <jlam@pkgsrc.org>2004-03-10 17:58:22 +0000
commit2653555f39c8797935782d2da9465efa829a5584 (patch)
tree491aad2cbb9439a475432347840b3927fd6651e7 /editors
parentd68193d4743931877544a7e52ed44171707b858d (diff)
downloadpkgsrc-2653555f39c8797935782d2da9465efa829a5584.tar.gz
Deal with situation where ICONV_TYPE isn't defined until after bsd.pkg.mk
is included by not checking its value explicitly.
Diffstat (limited to 'editors')
-rw-r--r--editors/abiword1/Makefile10
1 files changed, 4 insertions, 6 deletions
diff --git a/editors/abiword1/Makefile b/editors/abiword1/Makefile
index 0d503b528c1..edbd19d9a6c 100644
--- a/editors/abiword1/Makefile
+++ b/editors/abiword1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/02/11 12:20:03 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/10 17:58:22 jlam Exp $
#
# According to AbiSource's explanation of their trademark rights,
# compilations/distributions of AbiWord not provided by AbiSource must
@@ -35,6 +35,9 @@ CONFIGURE_ARGS+= --with-expat=${BUILDLINK_PREFIX.expat}
CONFIGURE_ARGS+= --without-libwmf
CONFIGURE_ARGS+= --prefix=${PREFIX}
CONFIGURE_ARGS+= --datadir=${PREFIX}/share
+CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
+
+CONFIGURE_ARGS.gnu-iconv= --with-libiconv=${BUILDLINK_PREFIX.iconv}
OS_CFLAGS= ${CFLAGS}
@@ -48,11 +51,6 @@ MAKE_FLAGS+= ABI_BUILD_VERSION="${ABIWORD_VERS}"
MAKE_FLAGS+= UNIX_CAN_BUILD_STATIC=0
.include "../../converters/libiconv/buildlink2.mk"
-
-.if defined(ICONV_TYPE) && (${ICONV_TYPE} == "gnu")
-CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv}
-.endif
-
.include "../../converters/psiconv/buildlink2.mk"
.include "../../graphics/png/buildlink2.mk"
.include "../../textproc/expat/buildlink2.mk"