diff options
| author | salo <salo@pkgsrc.org> | 2005-04-27 02:28:04 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2005-04-27 02:28:04 +0000 |
| commit | 83af86850dc325d94ea629d36f888ae84a994057 (patch) | |
| tree | 96c44b3f66b75601a1756cee54d9dab7e91bc57e /mk | |
| parent | 4b3a03bda38b80f81eb030b082a4efeed82a3db5 (diff) | |
| download | pkgsrc-83af86850dc325d94ea629d36f888ae84a994057.tar.gz | |
Pullup ticket 467 - requested by Thor Lancelot Simon
infrastructure fix for xemacs packages
Revisions pulled up:
- pkgsrc/mk/emacs.mk 1.18
Module Name: pkgsrc
Committed By: jwise
Date: Fri Apr 8 19:05:29 UTC 2005
Modified Files:
pkgsrc/mk: emacs.mk
Log Message:
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')
| -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..431b76d5388 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.17.2.1 2005/04/27 02:28:04 salo 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} |