diff options
| -rw-r--r-- | devel/glib2/Makefile | 4 | ||||
| -rw-r--r-- | editors/abiword1/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/gnome-vfs/Makefile | 4 | ||||
| -rw-r--r-- | textproc/xerces-c/Makefile | 5 |
4 files changed, 9 insertions, 8 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index 014f4e2a3e2..c72f6d31ccd 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2004/02/11 01:46:30 abs Exp $ +# $NetBSD: Makefile,v 1.38 2004/02/11 12:20:03 jlam Exp $ DISTNAME= glib-2.2.3 PKGREVISION= 1 @@ -37,7 +37,7 @@ TEST_TARGET= check .include "../../converters/libiconv/buildlink3.mk" -.if defined(ICONV_IS_GNU) +.if defined(ICONV_TYPE) && (${ICONV_TYPE} == "gnu") CONFIGURE_ARGS+= --with-libiconv=gnu .endif diff --git a/editors/abiword1/Makefile b/editors/abiword1/Makefile index 2fbada785a3..0d503b528c1 100644 --- a/editors/abiword1/Makefile +++ b/editors/abiword1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/01/22 08:30:30 grant Exp $ +# $NetBSD: Makefile,v 1.6 2004/02/11 12:20:03 jlam Exp $ # # According to AbiSource's explanation of their trademark rights, # compilations/distributions of AbiWord not provided by AbiSource must @@ -49,7 +49,7 @@ MAKE_FLAGS+= UNIX_CAN_BUILD_STATIC=0 .include "../../converters/libiconv/buildlink2.mk" -.if defined(ICONV_IS_GNU) +.if defined(ICONV_TYPE) && (${ICONV_TYPE} == "gnu") CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv} .endif diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile index 618f253648a..829292ab339 100644 --- a/sysutils/gnome-vfs/Makefile +++ b/sysutils/gnome-vfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2004/01/24 15:06:57 grant Exp $ +# $NetBSD: Makefile,v 1.37 2004/02/11 12:20:03 jlam Exp $ DISTNAME= gnome-vfs-1.0.5 PKGREVISION= 5 @@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --enable-gtk-doc=no .include "../../converters/libiconv/buildlink2.mk" -.if defined(ICONV_IS_GNU) +.if defined(ICONV_TYPE) && (${ICONV_TYPE} == "gnu") CONFIGURE_ARGS+= --with-libiconv=yes .endif diff --git a/textproc/xerces-c/Makefile b/textproc/xerces-c/Makefile index f47834c143f..0aee40d8e48 100644 --- a/textproc/xerces-c/Makefile +++ b/textproc/xerces-c/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/02/11 04:06:04 minskim Exp $ +# $NetBSD: Makefile,v 1.17 2004/02/11 12:20:03 jlam Exp $ # DISTNAME= xerces-c-src_2_3_0 @@ -35,7 +35,8 @@ CONFIGURE_ARGS+= -m inmem # message loader CONFIGURE_ARGS+= -r none # threading .include "../../converters/libiconv/buildlink3.mk" -.if defined(ICONV_IS_GNU) + +.if defined(ICONV_TYPE) && (${ICONV_TYPE} == "gnu") CONFIGURE_ARGS+= -t IconvGNU # transcoder PLIST_SUBST+= NATIVEICONV="@comment " GNUICONV="" .else |