summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorminskim <minskim>2011-03-23 15:15:20 +0000
committerminskim <minskim>2011-03-23 15:15:20 +0000
commit9100a012687ed85efebb6799c8cdd41a965581ba (patch)
tree565570eb292edeb57761ce3e60388213e0a6dcde /editors
parenta65bc33d74ab9cd25d177d77dc144b6d96033b40 (diff)
downloadpkgsrc-9100a012687ed85efebb6799c8cdd41a965581ba.tar.gz
Fix EMACSLOADPATH for emacs24.
Diffstat (limited to 'editors')
-rw-r--r--editors/emacs/modules.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/editors/emacs/modules.mk b/editors/emacs/modules.mk
index 9b4ddb773a7..d6dd97577ef 100644
--- a/editors/emacs/modules.mk
+++ b/editors/emacs/modules.mk
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.14 2011/02/08 13:20:13 hiramatsu Exp $
+# $NetBSD: modules.mk,v 1.15 2011/03/23 15:15:20 minskim Exp $
#
# This Makefile fragment handles Emacs Lisp Packages (== ELPs).
#
@@ -343,7 +343,11 @@ PRINT_PLIST_AWK+= { gsub(/${EMACS_LISPPREFIX:S|${PREFIX}/||:S|/|\\/|g}/, \
.if defined(EMACS_BUILDLINK)
_EMACS_DIR= ${BUILDLINK_DIR}/share/emacs
+. if empty(EMACS_TYPE:Memacs24)
ALL_ENV+= EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}/lisp:${_EMACS_DIR}/site-lisp
+. else
+ALL_ENV+= EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}.${_EMACS_VERSION_MICRO}/lisp:${_EMACS_DIR}/site-lisp
+. endif
.include "${_EMACS_PKGDIR}/buildlink3.mk"
.endif