diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2015-04-01 21:55:00 +0200 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2015-04-01 21:55:00 +0200 |
| commit | a2a752b2debb58dda23b7c982c00095cc7f3e492 (patch) | |
| tree | 29691bc663aa02b62079d23973069ccc8e93e5ae /Makefile | |
| parent | 95ff8d7a942dff176c6bd85db640a680761be8e9 (diff) | |
Makefile: rename EMACS to EMACSBIN
EMACS is still used to mean "inside Emacs", so without using another
variable it would not be possible to build Magit from within Emacs.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -20,11 +20,11 @@ RMDIR ?= rm -rf MAKEINFO ?= makeinfo INSTALL_INFO ?= install-info -EFLAGS ?= -L ../git-modes -L ../cl-lib -EMACS ?= emacs -BATCH = $(EMACS) $(EFLAGS) -batch -Q -L . -BATCHE = $(BATCH) -eval -BATCHC = $(BATCH) -f batch-byte-compile +EFLAGS ?= -L ../git-modes -L ../cl-lib +EMACSBIN ?= emacs +BATCH = $(EMACSBIN) $(EFLAGS) -batch -Q -L . +BATCHE = $(BATCH) -eval +BATCHC = $(BATCH) -f batch-byte-compile VERSION=$(shell \ test -e .git && git describe --tags --dirty 2> /dev/null || \ @@ -201,7 +201,7 @@ test: $(ELCS) .PHONY: test-interactive test-interactive: $(ELCS) - @$(EMACS) $(EFLAGS) -Q -L "." --eval "(progn\ + @$(EMACSBIN) $(EFLAGS) -Q -L "." --eval "(progn\ (require 'cl)\ (put 'flet 'byte-obsolete-info nil)\ (load-file \"tests/magit-tests.el\")\ |