diff options
| author | rillig <rillig> | 2007-11-03 11:23:06 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2007-11-03 11:23:06 +0000 |
| commit | 6644122be5e1bd7ba6594702a95ae11032d13970 (patch) | |
| tree | c8ce07bc6e0b1bb17adfaea320b49d2fd5195870 /mk | |
| parent | 6f30b1199d42f31c87b770edb2455007af16984f (diff) | |
| download | pkgsrc-6644122be5e1bd7ba6594702a95ae11032d13970.tar.gz | |
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 (limited to 'mk')
| -rw-r--r-- | mk/emacs.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mk/emacs.mk b/mk/emacs.mk index 414fc181964..14805411b69 100644 --- a/mk/emacs.mk +++ b/mk/emacs.mk @@ -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 @@ _SYS_VARS.emacs= EMACS_BIN EMACS_ETCPREFIX EMACS_FLAVOR \ 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 @@ _EMACS_BLNK.xemacs215= ../../editors/xemacs-current/buildlink3.mk # 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} |