diff options
| author | jlam <jlam@pkgsrc.org> | 2004-03-10 17:58:22 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-03-10 17:58:22 +0000 |
| commit | 40c2807f530b66b7854188cc0dfe0547d1200bc1 (patch) | |
| tree | 491aad2cbb9439a475432347840b3927fd6651e7 /devel/glib2 | |
| parent | d0b4c54eb698e718080690cf98ab5b8bbb4001e0 (diff) | |
| download | pkgsrc-40c2807f530b66b7854188cc0dfe0547d1200bc1.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 'devel/glib2')
| -rw-r--r-- | devel/glib2/Makefile | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index afb119ce311..dd37f7fc3b3 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2004/02/15 13:43:41 jlam Exp $ +# $NetBSD: Makefile,v 1.43 2004/03/10 17:58:22 jlam Exp $ DISTNAME= glib-2.2.3 PKGNAME= ${DISTNAME:S/glib/glib2/} @@ -20,6 +20,7 @@ USE_PKGLOCALEDIR= yes USE_GNU_TOOLS+= make USE_PERL5= yes USE_LIBTOOL= yes +TEST_TARGET= check PKGCONFIG_OVERRIDE= glib-2.0.pc.in PKGCONFIG_OVERRIDE+= gmodule-2.0.pc.in @@ -31,15 +32,11 @@ CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} CONFIGURE_ARGS+= --enable-gtk-doc=no CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html +CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv} -TEST_TARGET= check +CONFIGURE_ARGS.gnu-iconv= --with-libiconv=gnu .include "../../converters/libiconv/buildlink3.mk" - -.if defined(ICONV_TYPE) && (${ICONV_TYPE} == "gnu") -CONFIGURE_ARGS+= --with-libiconv=gnu -.endif - .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" |