pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Second cut of a fix for the problem where PKGNAME i...
details: https://anonhg.NetBSD.org/pkgsrc/rev/1a7a3f7ff83f
branches: trunk
changeset: 492284:1a7a3f7ff83f
user: jwise <jwise%pkgsrc.org@localhost>
date: Fri Apr 08 19:05:29 2005 +0000
description:
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:
mk/emacs.mk | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diffs (23 lines):
diff -r 6f1c78b7d67e -r 1a7a3f7ff83f mk/emacs.mk
--- a/mk/emacs.mk Fri Apr 08 19:00:15 2005 +0000
+++ b/mk/emacs.mk Fri Apr 08 19:05:29 2005 +0000
@@ -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_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}
Home |
Main Index |
Thread Index |
Old Index