branch: elpa/forth-mode
commit fdc218c6f200a33852b7b39b470bd3ac80053826
Author: Lars Brinkhoff <[email protected]>
Commit: Lars Brinkhoff <[email protected]>

    Don't get Makefile variable EMACS from environment; it may be set to 't'.
---
 .travis.yml | 2 +-
 Makefile    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 038d4cbf1e..a986285750 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,6 @@ env:
   - EMACS=emacs23
   - EMACS=emacs24
 install: sudo apt-get update -y && sudo apt-get install emacs23 emacs24
-script: make
+script: make EMACS=$EMACS
 notifications:
   email: [email protected]
diff --git a/Makefile b/Makefile
index 15cfc1b1ac..7c03473842 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-EMACS ?= emacs
+EMACS = emacs
 EMACS_LOAD = $(EMACS) -Q --batch --load
 
 all:

Reply via email to