pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

(emacs-git/modules.mk) Adjust for emacs 25/26/27



Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara (CF-SX2) <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Sat Jun 23 21:44:01 2018 +0900
Changeset:	b7b8f2f53ab069e94a066533a4ccd27ce4cac461

Modified Files:
	emacs-git/modules.mk

Log Message:
(emacs-git/modules.mk) Adjust for emacs 25/26/27

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b7b8f2f53ab069e94a066533a4ccd27ce4cac461

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 emacs-git/modules.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diffs:
diff --git a/emacs-git/modules.mk b/emacs-git/modules.mk
index cb05a32a9e..abb47abe1d 100644
--- a/emacs-git/modules.mk
+++ b/emacs-git/modules.mk
@@ -342,10 +342,10 @@ PRINT_PLIST_AWK+=	{ gsub(/${EMACS_LISPPREFIX:S|${PREFIX}/||:S|/|\\/|g}/, \
 
 .if defined(EMACS_BUILDLINK)
 _EMACS_DIR=	${BUILDLINK_DIR}/share/emacs
-.  if empty(EMACS_TYPE:Memacs25) && empty(EMACS_TYPE:Memacs26) && empty(EMACS_TYPE:Memacs27)
-ALL_ENV+=	EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}/lisp:${_EMACS_DIR}/site-lisp
-.  else
+.  if !empty(EMACS_TYPE:Memacs27)
 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
 .include	"${_EMACS_PKGDIR}/buildlink3.mk"
 .endif


Home | Main Index | Thread Index | Old Index