[pkgsrc/trunk]: pkgsrc/mk Variables that are not lists should not use the emp...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/866ae0636145
branches:  trunk
changeset: 534866:866ae0636145
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Nov 03 11:23:06 2007 +0000

description:
Variables that are not lists should not use the empty(...:M) construct
if the same can be expressed more clearly.

Added some internal variables to be shown by "bmake show-all-emacs".

diffstat:

 mk/emacs.mk |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 98c679e5f9d0 -r 866ae0636145 mk/emacs.mk
--- a/mk/emacs.mk       Sat Nov 03 10:25:33 2007 +0000
+++ b/mk/emacs.mk       Sat Nov 03 11:23:06 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: emacs.mk,v 1.44 2007/10/29 13:13:31 uebayasi Exp $
+# $NetBSD: emacs.mk,v 1.45 2007/11/03 11:23:06 rillig Exp $
 #
 # This Makefile fragment handles Emacs Lisp Packages (== ELPs).
 #
@@ -190,6 +190,7 @@
                        EMACS_INFOPREFIX EMACS_LISPPREFIX \
                        EMACS_PKGNAME_PREFIX \
                        EMACS_VERSION_MAJOR EMACS_VERSION_MINOR
+_DEF_VARS.emacs=       _EMACS_TYPE _EMACS_PKGBASE _EMACS_VERSION_FULL _EMACS_BLNK
 BUILD_DEFS+=           ${_USER_VARS.emacs}
 BUILD_DEFS_EFFECTS+=   ${_SYS_VARS.emacs}
 
@@ -264,7 +265,7 @@
 #              abort;
 #
 
-.if !empty(EMACS_TYPE:Memacs) || !empty(EMACS_TYPE:Mxemacs)
+.if ${EMACS_TYPE} == "emacs" || ${EMACS_TYPE} == "xemacs"
 _EMACS_TYPE=   ${_EMACS_VERSION_DEFAULT.${EMACS_TYPE}}
 .endif
 _EMACS_TYPE?=  ${EMACS_TYPE}