Date: Sat, 5 Mar 2005 20:50:20 GMT From: Andrey Slusar <anrays@gmail.com> To: freebsd-ports-bugs@FreeBSD.org Subject: ports/61069 [patch] ports/Mk/bsd.emacs.mk is not PREFIX clean Message-ID: <200503052050.j25KoKbb094413@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/61069; it has been noted by GNATS.
From: Andrey Slusar <anrays@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org, haro@h4.dion.ne.jp
Cc:
Subject: ports/61069 [patch] ports/Mk/bsd.emacs.mk is not PREFIX clean
Date: Sat, 05 Mar 2005 22:45:19 +0200
Hi,
I think, patch from submitter is not fully correct. Please, review my
patch, fixed this problem:
--8<---------------cut here---------------start------------->8---
--- Mk/bsd.emacs.mk.orig Sat Mar 5 16:57:12 2005
+++ Mk/bsd.emacs.mk Sat Mar 5 17:04:32 2005
@@ -213,10 +213,15 @@
#
# emacsen command-line filename
-EMACS_CMD?= ${LOCALBASE}/bin/${EMACS_NAME}-${EMACS_VER}
+.if exists(${LOCALBASE}/bin/${EMACS_NAME}-${EMACS_VER})
+EMACS_BASE?= ${LOCALBASE}
+.elsif exists(${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER})
+EMACS_BASE?= ${PREFIX}
+.endif
+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
--8<---------------cut here---------------end--------------->8---
--
Regards,
Andrey.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200503052050.j25KoKbb094413>