[elpa] externals/bind-key 116e042f72 10/13: Merge pull request #1012 from skangas/makefile-emacsbin

[ELPA Syncer]

branch: externals/bind-key
commit 116e042f7208658a0c7a8fc9e54c05a2ff9ec6ca
Merge: da899c4674 dc279c7418
Author: John Wiegley <johnw@newartisans.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #1012 from skangas/makefile-emacsbin
    
    fixes https://github.com/jwiegley/use-package/issues/649
---
 Makefile     | 4 ++--
 Makefile.doc | 2 +-
 default.mk   | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index ebf0136acf..77d1c3748d 100644
--- a/Makefile
+++ b/Makefile
@@ -107,12 +107,12 @@ test:
        (ert-run-tests-batch-and-exit))"
 
 test-interactive:
-       @$(EMACSBIN) -Q $(LOAD_PATH) --eval "(progn\
+       @$(EMACS) -Q $(LOAD_PATH) --eval "(progn\
        (load-file \"use-package-tests.el\")\
        (ert t))"
 
 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 'use-package))"
 
diff --git a/Makefile.doc b/Makefile.doc
index 89791ac55f..78575501ee 100644
--- a/Makefile.doc
+++ b/Makefile.doc
@@ -64,7 +64,7 @@ ORG_EVAL = --funcall org-texinfo-export-to-texinfo
 
 texi:
        @printf "Generating use-package.texi\n"
-       @$(EMACSBIN) $(ORG_ARGS) use-package.org $(ORG_EVAL)
+       @$(EMACS) $(ORG_ARGS) use-package.org $(ORG_EVAL)
        @echo >> use-package.texi
 
 stats:
diff --git a/default.mk b/default.mk
index 92fb004b3a..e9c5f21504 100644
--- a/default.mk
+++ b/default.mk
@@ -27,8 +27,7 @@ TAR      ?= tar
 SED      ?= sed
 
 EMACS    ?= emacs
-EMACSBIN ?= $(EMACS)
-BATCH     = $(EMACSBIN) -Q --batch $(LOAD_PATH)
+BATCH     = $(EMACS) -Q --batch $(LOAD_PATH)
 
 INSTALL_INFO     ?= $(shell command -v ginstall-info || printf install-info)
 MAKEINFO         ?= makeinfo
@@ -81,7 +80,7 @@ ifndef LOAD_PATH
 
 ELPA_DIR ?= $(HOME)/.emacs.d/elpa
 
-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