diff options
author | tv <tv@pkgsrc.org> | 2005-05-17 18:29:44 +0000 |
---|---|---|
committer | tv <tv@pkgsrc.org> | 2005-05-17 18:29:44 +0000 |
commit | 55ce943c03c1fdc2d5d7174606a18fe07cb7a4f3 (patch) | |
tree | 5da599b8bba9455673f653f44043adc643d0075e /mk/emacs.mk | |
parent | 78d0750d494edd033c5dec750d3c949e26f6af98 (diff) | |
download | pkgsrc-55ce943c03c1fdc2d5d7174606a18fe07cb7a4f3.tar.gz |
sync [all but bsd.pkg.mk] with HEAD
Diffstat (limited to 'mk/emacs.mk')
-rw-r--r-- | mk/emacs.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mk/emacs.mk b/mk/emacs.mk index 9cc4ae53a12..f3b20f55eaf 100644 --- a/mk/emacs.mk +++ b/mk/emacs.mk @@ -1,4 +1,4 @@ -# $NetBSD: emacs.mk,v 1.16.10.1 2005/03/21 15:43:00 tv Exp $ +# $NetBSD: emacs.mk,v 1.16.10.2 2005/05/17 18:29:44 tv Exp $ # # A Makefile fragment for Emacs Lisp packages. # @@ -175,9 +175,13 @@ EMACS_BIN= ${PREFIX}/bin/xemacs EMACS_PKG_VERSION= ${_EMACS_VERSION_XEMACS_FULL:C|^.*-||} EMACS_LISPPREFIX= ${PREFIX}/lib/xemacs/site-packages/lisp PKGNAME_PREFIX= xemacs- +.if defined(PKGNAME) PKGNAME:= ${PKGNAME_PREFIX}${PKGNAME} +.else +PKGNAME:= ${PKGNAME_PREFIX}${DISTNAME}${PKGREVISION} CONFLICTS+= ${PKGBASE:C|^xemacs-||}-[0-9]* .endif +.endif # strip out nb? EMACS_VERSION=${EMACS_PKG_VERSION:C|nb[0-9]*$||} PLIST_SUBST+= EMACS_VERSION=${EMACS_VERSION} |