diff options
| author | jwise <jwise@pkgsrc.org> | 2005-04-08 19:05:29 +0000 |
|---|---|---|
| committer | jwise <jwise@pkgsrc.org> | 2005-04-08 19:05:29 +0000 |
| commit | e73be0151fb05001a71bcac971a1f2a7281a329d (patch) | |
| tree | 9dcb4b047d50b616c9b1505b969680ec135bbd3c /mk/emacs.mk | |
| parent | fdc5810466ce244b2af665899cf5a85aee21aadc (diff) | |
| download | pkgsrc-e73be0151fb05001a71bcac971a1f2a7281a329d.tar.gz | |
Second cut of a fix for the problem where PKGNAME is geting set to xemacs-${VERRSION}
(not xemacs-${PKGNAME}-${VERSION}) for all packages using this and not explicitly
setting PKGNAME>
A better way of doing this should be found, but this fixes builds.
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 a204b742727..5bb2cfcdcb6 100644 --- a/mk/emacs.mk +++ b/mk/emacs.mk @@ -1,4 +1,4 @@ -# $NetBSD: emacs.mk,v 1.17 2005/03/07 17:48:08 jwise Exp $ +# $NetBSD: emacs.mk,v 1.18 2005/04/08 19:05:29 jwise 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} |