Merge pull request #1023 from gracjan/pr-find-emacs-once

gracjan · gracjan · commit ea5cc3b1dbae · 2015-12-11T14:26:25.000+01:00
Find Emacs once
diff --git a/Makefile b/Makefile
@@ -23,13 +23,7 @@ INSTALL_INFO = install-info
 #
 # This is particularly useful when EMACS is set in ~/.bash_profile
 #
-EMACS := $(shell echo "$${EMACS:-emacs}")
-
-# Emacs itself sets the $EMACS environment variable to t if it is not
-# present, so we should ignore the variable if this is its value.
-ifeq ($(EMACS),t)
-EMACS := emacs
-endif
+EMACS := $(shell which "$${EMACS}" || which "emacs")
 
 EFLAGS = --eval "(add-to-list 'load-path (expand-file-name \"tests/compat\") 'append)" \
 	 --eval "(when (< emacs-major-version 24) \

Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,7 @@ INSTALL_INFO = install-info`
`23`	`23`	`#`
`24`	`24`	`# This is particularly useful when EMACS is set in ~/.bash_profile`
`25`	`25`	`#`
`26`		`-EMACS := $(shell echo "$${EMACS:-emacs}")`
`27`		`-`
`28`		`-# Emacs itself sets the $EMACS environment variable to t if it is not`
`29`		`-# present, so we should ignore the variable if this is its value.`
`30`		`-ifeq ($(EMACS),t)`
`31`		`-EMACS := emacs`
`32`		`-endif`
	`26`	`+EMACS := $(shell which "$${EMACS}" \|\| which "emacs")`
`33`	`27`
`34`	`28`	`EFLAGS = --eval "(add-to-list 'load-path (expand-file-name \"tests/compat\") 'append)" \`
`35`	`29`	`--eval "(when (< emacs-major-version 24) \`