diff options
| author | minskim <minskim@pkgsrc.org> | 2009-08-22 18:51:58 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2009-08-22 18:51:58 +0000 |
| commit | 8b75e3dfb0375f8281b76fa973136c8ec92af6b4 (patch) | |
| tree | 2e8c2f7986d8840d078eddda7bea08c7c6255049 /editors/emacs | |
| parent | 2e625df3cfee907f3b47244b7f42a0a11cc16608 (diff) | |
| download | pkgsrc-8b75e3dfb0375f8281b76fa973136c8ec92af6b4.tar.gz | |
Derive EMACSLOADPATH from the currently-installed emacs, not from the
Makefile fragment in pkgsrc.
Diffstat (limited to 'editors/emacs')
| -rw-r--r-- | editors/emacs/modules.mk | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/editors/emacs/modules.mk b/editors/emacs/modules.mk index c6ebc945523..d6b4f2b2bef 100644 --- a/editors/emacs/modules.mk +++ b/editors/emacs/modules.mk @@ -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 @@ PRINT_PLIST_AWK+= { gsub(/${EMACS_LISPPREFIX:S|${PREFIX}/||:S|/|\\/|g}/, \ .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 |