Dependency computation may not define SUBPACKAGE and undefine PACKAGING.

This repairs onew...
This commit is contained in:
espie 2001-04-23 23:19:02 +00:00
parent 594099de65
commit 771ee2ed5c
2 changed files with 7 additions and 3 deletions

View File

@ -1,7 +1,7 @@
# From FreeBSD: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
#
# $FreeBSD: Makefile,v 1.19 1997/09/23 02:17:58 max Exp $
# $OpenBSD: Makefile,v 1.36 2001/04/20 15:12:03 espie Exp $
# $OpenBSD: Makefile,v 1.37 2001/04/23 23:19:02 espie Exp $
COMMENT= "Japanese input method"
COMMENT-dict= "dictionaries for Japanese Wnn"
@ -32,6 +32,7 @@ WNNDICDIR=/var/dict/Wnn
WNNBASE=${PREFIX}
.if defined(PACKAGING)
SUBPACKAGE?=
. if ${SUBPACKAGE} == "-dict"
CATEGORIES= japanese
PREFIX=${WNNDICDIR}

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.12 2001/04/20 15:12:05 espie Exp $
# $OpenBSD: Makefile,v 1.13 2001/04/23 23:19:02 espie Exp $
COMMENT= 'canna (kana-kanji converter) libraries'
COMMENT-dict= 'canna (kana-kanji converter) dictionaries'
@ -32,8 +32,11 @@ PERMIT_DISTFILES_CDROM= No Fee
MULTI_PACKAGES=-dict -server
.if defined(PACKAGING) && ${SUBPACKAGE}=="-dict"
.if defined(PACKAGING)
SUBPACKAGE?=
. if ${SUBPACKAGE}=="-dict"
PREFIX= /var/dict
. endif
.endif
SUBST_VARS= DICT_DIR