From 6eae155ecefb9ca6724f3a7936497ba51c70af7a Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Wed, 10 Mar 2004 17:58:22 +0000
Subject: Deal with situation where ICONV_TYPE isn't defined until after
 bsd.pkg.mk is included by not checking its value explicitly.

---
 textproc/xerces-c/Makefile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'textproc/xerces-c')

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 \
-- 
cgit v1.2.3