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 /textproc | |
| 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 'textproc')
| -rw-r--r-- | textproc/xerces-c/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/textproc/xerces-c/Makefile b/textproc/xerces-c/Makefile index df024c48db6..2cc8030bbb6 100644 --- a/textproc/xerces-c/Makefile +++ b/textproc/xerces-c/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/02/18 20:30:31 minskim Exp $ +# $NetBSD: Makefile,v 1.20 2004/03/10 17:58:22 jlam Exp $ # DISTNAME= xerces-c-src_2_3_0 @@ -34,19 +34,19 @@ CONFIGURE_ARGS+= -p ${XERCES_PLATFORM} # platform CONFIGURE_ARGS+= -n socket # net accessor CONFIGURE_ARGS+= -m inmem # message loader CONFIGURE_ARGS+= -r none # threading +CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv} -.include "../../converters/libiconv/buildlink3.mk" +CONFIGURE_ARGS.gnu-iconv= -t IconvGNU # transcoder +PLIST_SUBST.gnu-iconv= NATIVEICONV="@comment " GNUICONV="" -.if defined(ICONV_TYPE) && (${ICONV_TYPE} == "gnu") -CONFIGURE_ARGS+= -t IconvGNU # transcoder -PLIST_SUBST+= NATIVEICONV="@comment " GNUICONV="" -.else -CONFIGURE_ARGS+= -t native # transcoder -PLIST_SUBST+= NATIVEICONV="" GNUICONV="@comment " -.endif +CONFIGURE_ARGS.native-iconv= -t native # transcoder +PLIST_SUBST.native-iconv= NATIVEICONV="" GNUICONV="@comment " CONFIGURE_ENV+= ${XERCES_ENV} MAKE_ENV+= ${XERCES_ENV} +PLIST_SUBST+= ${PLIST_SUBST.${ICONV_TYPE}-iconv} + +.include "../../converters/libiconv/buildlink3.mk" post-install: ${INSTALL_DATA} ${WRKSRC}/dom/impl/*.hpp \ |