From 27cfda7970c30b2728c21566be25074582b3919d Mon Sep 17 00:00:00 2001
From: sakamoto <sakamoto@pkgsrc.org>
Date: Sun, 30 Apr 2000 15:01:45 +0000
Subject: set CANNA_OPT only in canna linked. Fixes pkg/10018 by
 iwamoto@sat.t.u-tokyo.ac.jp.

---
 editors/nvi-m17n/Makefile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile
index 5c9ae31e29c..9e1e7e2a079 100644
--- a/editors/nvi-m17n/Makefile
+++ b/editors/nvi-m17n/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/01/19 12:28:44 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2000/04/30 15:01:45 sakamoto Exp $
 # FreeBSD Id: Makefile,v 1.11 1999/04/17 10:51:03 itojun Exp
 
 DISTNAME=	nvi-1.79
@@ -27,6 +27,7 @@ PATCH_FUZZ_FACTOR=	-F1
 .if !defined(USE_CANNA) || ${USE_CANNA} == YES
 DEPENDS+=	Canna-lib-3.5b2:../../japanese/canna-lib
 CONFIGURE_ARGS+=--enable-canna=${LOCALBASE}
+CANNA_OPT=	canna cannactrl cannakey=
 .endif
 
 PLIST_TMP=	${WRKDIR}/PLIST
@@ -35,10 +36,6 @@ PLIST_SRC+=	${PKGDIR}/PLIST ${PLIST_TMP}
 REQ_TMP=	${PKGDIR}/REQ
 REQ_FILE=	${WRKDIR}/REQ
 
-CANNA_OPT.euc-jp=canna cannactrl cannakey=
-CANNA_OPT.sjis=${CANNA_OPT.euc-jp}
-CANNA_OPT.iso-2022-jp=${CANNA_OPT.euc-jp}
-
 AUTODETECT.euc-jp=jp
 AUTODETECT.sjis=jp
 AUTODETECT.iso-2022-jp=jp
@@ -58,7 +55,7 @@ ENCODING+=	euc-jp euc-cn euc-kr sjis big5 euc-tw hz
 
 post-build:
 .for encoding in ${ENCODING}
-	@${SED} -e 's|$${CANNA_OPT}|${CANNA_OPT.${encoding}}|'		\
+	@${SED} -e 's|$${CANNA_OPT}|${CANNA_OPT}|'			\
 		-e 's|$${AUTODETECT}|${AUTODETECT.${encoding}}|'	\
 		-e 's|$${ENCODING}|${encoding}|g'			\
 		-e 's|$${PREFIX}|${PREFIX}|'				\
-- 
cgit v1.2.3