diff options
| author | sem <sem@FreeBSD.org> | 2005-04-18 02:13:12 +0800 |
|---|---|---|
| committer | sem <sem@FreeBSD.org> | 2005-04-18 02:13:12 +0800 |
| commit | 2e48f6c51fcc48cfbe87198c8b15205c7f49f713 (patch) | |
| tree | faba4f160ca587762d1116c2cc70f0c3e3e72287 | |
| parent | b8d90757d17d36d2e1433802dc25188cdf93e8b8 (diff) | |
| download | freebsd-ports-gnome-2e48f6c51fcc48cfbe87198c8b15205c7f49f713.tar.gz freebsd-ports-gnome-2e48f6c51fcc48cfbe87198c8b15205c7f49f713.tar.zst freebsd-ports-gnome-2e48f6c51fcc48cfbe87198c8b15205c7f49f713.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
| -rw-r--r-- | Mk/bsd.emacs.mk | 14 |
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 |