From d5480dae39e9c13acf5762b752b0a4c2b0136c54 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Thu, 19 Feb 2015 23:21:09 -0500
Subject: Makefile: Fix batch test run for travis

Commit 9e80dc263 redefined the EMACS variable in the Makefile to
include the --batch flag, but this is overridden in .travis.yml, so
specify the flags separately.
---
 Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 79ead40..5704e62 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
-EMACS = emacs -Q --batch
+EMACS = emacs
+BATCH := $(EMACS) -Q --batch
 name = bog
 main_el :=  $(name).el
 main_elc =  $(main_el)c
@@ -10,7 +11,7 @@ all: elc autoloads
 autoloads: $(AUTOLOADS_FILE)
 
 $(AUTOLOADS_FILE): $(main_el)
-	@$(EMACS) -L . --eval \
+	@$(BATCH) -L . --eval \
 	"(let (make-backup-files) \
 	  (update-file-autoloads \"$(CURDIR)/$<\" t \"$(CURDIR)/$@\"))"
 
@@ -34,9 +35,9 @@ help:
 
 .PHONY: test
 test: $(main_elc)
-	@$(EMACS) -L . -l bog-tests \
+	@$(BATCH) -L . -l bog-tests \
 	--eval "(ert-run-tests-batch-and-exit '(not (tag interactive)))"
 
 %.elc: %.el
-	@$(EMACS) -L . -f batch-byte-compile $<
+	@$(BATCH) -L . -f batch-byte-compile $<
 
-- 
cgit v1.2.3