[nongnu] elpa/git-commit 0154391fa2 3/3: make: Rename EMACSBIN variable to EMACS

[ELPA Syncer]

branch: elpa/git-commit
commit 0154391fa24538347d76bd64d3879fb68237f851
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    make: Rename EMACSBIN variable to EMACS
    
    I've been doing that for a long time for many of my other packages
    and nobody reported an issue, but if someone is trying to build magit
    by running make in a terminal running inside emacs and that uses bash
    4.3 or older, then that would fail now.  On the other hand more people
    likely try "EMACS=emacs-26.1 make" and then wonder why that doesn't
    work.  (The new variable for indicating to a shell that it is running
    inside emacs is INSIDE_EMACS.)
---
 Makefile      | 2 +-
 default.mk    | 6 +++---
 docs/Makefile | 4 ++--
 test/Makefile | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 9712e2f546..6f7c842396 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,7 @@ test-interactive:
        @$(MAKE) -C test test-interactive
 
 emacs-Q: clean-lisp
-       @$(EMACSBIN) -Q $(LOAD_PATH) --debug-init --eval "(progn\
+       @$(EMACS) -Q $(LOAD_PATH) --debug-init --eval "(progn\
        (setq debug-on-error t)\
        (require 'magit)\
        (global-set-key \"\\C-xg\" 'magit-status))"
diff --git a/default.mk b/default.mk
index 920ad09df3..e102c9c218 100644
--- a/default.mk
+++ b/default.mk
@@ -25,8 +25,8 @@ RMDIR    ?= rm -rf
 TAR      ?= tar
 SED      ?= sed
 
-EMACSBIN ?= emacs
-BATCH     = $(EMACSBIN) -Q --batch $(LOAD_PATH)
+EMACS    ?= emacs
+BATCH     = $(EMACS) -Q --batch $(LOAD_PATH)
 
 INSTALL_INFO     ?= $(shell command -v ginstall-info || printf install-info)
 MAKEINFO         ?= makeinfo
@@ -184,7 +184,7 @@ MAGIT_SECTION_DIR ?= $(shell \
   find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/magit-section-[.0-9]*' 2> 
/dev/null | \
   sort | tail -n 1)
 
-SYSTYPE := $(shell $(EMACSBIN) -Q --batch --eval "(princ system-type)")
+SYSTYPE := $(shell $(EMACS) -Q --batch --eval "(princ system-type)")
 ifeq ($(SYSTYPE), windows-nt)
   CYGPATH := $(shell cygpath --version 2>/dev/null)
 endif
diff --git a/docs/Makefile b/docs/Makefile
index 3eb3dd8d56..084158eb7d 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -91,10 +91,10 @@ ORG_EVAL += --eval "(setq org-src-preserve-indentation nil)"
 ORG_EVAL += --funcall org-texinfo-export-to-texinfo
 
 texi:
-       @$(EMACSBIN) $(ORG_ARGS) $(PKG).org $(ORG_EVAL)
+       @$(EMACS) $(ORG_ARGS) $(PKG).org $(ORG_EVAL)
        @printf "\n" >> $(PKG).texi
        @rm -f $(PKG).texi~
-       @$(EMACSBIN) $(ORG_ARGS) magit-section.org $(ORG_EVAL)
+       @$(EMACS) $(ORG_ARGS) magit-section.org $(ORG_EVAL)
        @printf "\n" >> magit-section.texi
        @rm -f magit-section.texi~
 
diff --git a/test/Makefile b/test/Makefile
index 5c8d3cb959..c921c557fe 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -9,6 +9,6 @@ test:
        (ert-run-tests-batch-and-exit))"
 
 test-interactive:
-       @$(EMACSBIN) -Q $(LOAD_PATH) --eval "(progn\
+       @$(EMACS) -Q $(LOAD_PATH) --eval "(progn\
        (load-file \"$(TOP)test/magit-tests.el\")\
        (ert t))"