From 4c4698949271231ab34d8a2ba1faf80983e11e10 Mon Sep 17 00:00:00 2001 From: obache Date: Sat, 10 Jan 2009 05:13:01 +0000 Subject: Need CANNA_SPOOL at configure phase to generate cannaconf.h, it's for ERRDIR. Add CANNA_ENV to SCRIPTS_ENV for imake. This is only affect to canna-server, as reported by MOCHIDA Shuji by PR 40349. Bump PKGREVISION of canna-server package. --- inputmethod/canna-server/Makefile | 4 ++-- inputmethod/canna/Makefile.common | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'inputmethod') diff --git a/inputmethod/canna-server/Makefile b/inputmethod/canna-server/Makefile index 81a31d6f2c2..99f259db510 100644 --- a/inputmethod/canna-server/Makefile +++ b/inputmethod/canna-server/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.20 2008/09/18 12:35:27 taca Exp $ +# $NetBSD: Makefile,v 1.21 2009/01/10 05:13:01 obache Exp $ -PKGREVISION= 3 +PKGREVISION= 4 CANNA_MODULE= server .include "../../inputmethod/canna/Makefile.common" diff --git a/inputmethod/canna/Makefile.common b/inputmethod/canna/Makefile.common index ce6b7b5840d..c08cc5e18d8 100644 --- a/inputmethod/canna/Makefile.common +++ b/inputmethod/canna/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.18 2007/09/07 22:12:12 jlam Exp $ +# $NetBSD: Makefile.common,v 1.19 2009/01/10 05:13:01 obache Exp $ # # Canna common makefile. # @@ -33,5 +33,6 @@ CANNA_ENV= CANNA_USER=${CANNA_USER} \ CANNA_MODE=${CANNA_MODE} \ IMDICTDIR=${IMDICTDIR} MAKE_ENV+= ${CANNA_ENV} +SCRIPTS_ENV+= ${CANNA_ENV} PLIST_SUBST+= ${CANNA_ENV} FILES_SUBST+= ${CANNA_ENV} -- cgit v1.2.3