[pkgsrc/trunk]: pkgsrc/editors/emacs Derive EMACSLOADPATH from the currently-...

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/abf555f6d69c
branches:  trunk
changeset: 398047:abf555f6d69c
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sat Aug 22 18:51:58 2009 +0000

description:
Derive EMACSLOADPATH from the currently-installed emacs, not from the
Makefile fragment in pkgsrc.

diffstat:

 editors/emacs/modules.mk |  13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diffs (27 lines):

diff -r df04c0bfb3cb -r abf555f6d69c editors/emacs/modules.mk
--- a/editors/emacs/modules.mk  Sat Aug 22 17:19:40 2009 +0000
+++ b/editors/emacs/modules.mk  Sat Aug 22 18:51:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.9 2009/08/05 22:14:28 minskim Exp $
+# $NetBSD: modules.mk,v 1.10 2009/08/22 18:51:58 minskim Exp $
 #
 # This Makefile fragment handles Emacs Lisp Packages (== ELPs).
 #
@@ -338,12 +338,11 @@
 
 .if defined(EMACS_BUILDLINK)
 _EMACS_DIR=    ${BUILDLINK_DIR}/share/emacs
-.  if defined(_EMACS_VERSION_MICRO)
-ALL_ENV+=      EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}.${_EMACS_VERSION_MICRO}/lisp:${_EMACS_DIR}/site-lisp
-.  else
-ALL_ENV+=      EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}/lisp:${_EMACS_DIR}/site-lisp
-.  endif
-
+_EMACS_VERSION_DIR!=   \
+       ${PKG_INFO} -e emacs |                                          \
+       ${SED} -e 's/emacs-//' |                                        \
+       ${SED} -e 's/\.[0-9]\{8,\}//'
+ALL_ENV+=      EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_DIR}/lisp:${_EMACS_DIR}/site-lisp
 .include       "${_EMACS_PKGDIR}/buildlink3.mk"
 .endif