Merge commit '494c421bfa6f1b72b577267cb3841b0eff262250' from js2-mode

[gnu-emacs-elpa] / packages / hydra / Makefile

diff --git a/packages/hydra/Makefile b/packages/hydra/Makefile
index 4b6451f4fc1c642de3b19b1a3d81846d0cf87501..dd3a762e6c68fc39fbf47bcf51770f559fdd05e3 100644 (file)
--- a/packages/hydra/Makefile
+++ b/packages/hydra/Makefile
@@ -1,5 +1,5 @@
-EMACS = emacs
-# EMACS = emacs-24.3
+emacs ?= emacs
+# emacs = emacs-24.3
 
 LOAD = -l lv.el -l hydra.el -l hydra-test.el
 
@@ -8,11 +8,15 @@ LOAD = -l lv.el -l hydra.el -l hydra-test.el
 all: test
 
 test:
-       $(EMACS) -batch $(LOAD) -f ert-run-tests-batch-and-exit
+       @echo "Using $(shell which $(emacs))..."
+       $(emacs) -batch $(LOAD) -f ert-run-tests-batch-and-exit
 
-compile:
-       $(EMACS) -q $(LOAD) -l init.el --eval "(progn (mapc #'byte-compile-file '(\"hydra.el\" \"init.el\")) (switch-to-buffer \"*Compile-Log*\") (ert t))"
+run:
+       $(emacs) -q $(LOAD) -l hydra-init.el
        make clean
 
+compile:
+       $(emacs) -batch $(LOAD) -l hydra-init.el
+
 clean:
        rm -f *.elc