aboutsummaryrefslogtreecommitdiff
path: root/Mk/bsd.emacs.mk
diff options
context:
space:
mode:
authorSergey Matveychuk <sem@FreeBSD.org>2005-04-17 18:13:12 +0000
committerSergey Matveychuk <sem@FreeBSD.org>2005-04-17 18:13:12 +0000
commit1c67cde1f11897f22217aef811dc459053c700f9 (patch)
tree191ce1770ee52e05b54643d9263a7a31cca8d30a /Mk/bsd.emacs.mk
parent109bd17e850f408808b9e754186770738e70f1b2 (diff)
downloadports-1c67cde1f11897f22217aef811dc459053c700f9.tar.gz
ports-1c67cde1f11897f22217aef811dc459053c700f9.zip
- Make bsd.emacs.mk respect PREFIX
PR: ports/61069 Submitted by: Munehiro Matsuda <haro@h4.dion.ne.jp> Improved by: Andrey Slusar <anrays@gmail.com>, sem
Notes
Notes: svn path=/head/; revision=133534
Diffstat (limited to 'Mk/bsd.emacs.mk')
-rw-r--r--Mk/bsd.emacs.mk14
1 files changed, 10 insertions, 4 deletions
diff --git a/Mk/bsd.emacs.mk b/Mk/bsd.emacs.mk
index 1aa6d3ab471a..619075b99ae1 100644
--- a/Mk/bsd.emacs.mk
+++ b/Mk/bsd.emacs.mk
@@ -1,5 +1,5 @@
#
-# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.emacs.mk,v 1.40 2005-03-18 08:03:53 sem Exp $
+# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.emacs.mk,v 1.41 2005-04-17 18:13:12 sem Exp $
#
# bsd.emacs.mk - 19990829 Shigeyuki Fukushima.
#
@@ -212,12 +212,18 @@ check-makevars::
# Common Definitions
#
+# find where emacsen is installed
+# look for it in PREEFIX first and fall back to LOCALBASE then
+.if exists(${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER})
+EMACS_BASE?= ${PREFIX}
+.else
+EMACS_BASE?= ${LOCALBASE}
+.endif
# emacsen command-line filename
-EMACS_CMD?= ${LOCALBASE}/bin/${EMACS_NAME}-${EMACS_VER}
+EMACS_CMD?= ${EMACS_BASE}/bin/${EMACS_NAME}-${EMACS_VER}
# emacsen core elisp filename
EMACS_CORE_DIR= ${EMACS_LIBDIR_WITH_VER}/lisp/${EMACS_CORE_SUBDIR}
-EMACS_COREEL= ${LOCALBASE}/${EMACS_CORE_DIR}/startup.el
-
+EMACS_COREEL= ${EMACS_BASE}/${EMACS_CORE_DIR}/startup.el
# emacsen libdir without ${LOCALBASE}
EMACS_SITE_LISPDIR?= ${EMACS_LIBDIR}/site-lisp
EMACS_VERSION_SITE_LISPDIR?= ${EMACS_LIBDIR_WITH_VER}/site-lisp