Merge pull request #1308 from fice-t/make

gracjan · gracjan · commit 7649af3bcea2 · 2016-05-01T23:28:38.000+02:00
Don't message when EMACS shell variable is void
diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ INSTALL_INFO = install-info
 #
 # This is particularly useful when EMACS is set in ~/.bash_profile
 #
-EMACS := $(shell which "$${EMACS}" || which "emacs")
+EMACS := $(shell which "$${EMACS}" 2> /dev/null || which "emacs")
 EMACS_VERSION := $(shell "$(EMACS)" -Q --batch --eval '(princ emacs-version)')
 
 EFLAGS = --eval "(add-to-list 'load-path (expand-file-name \"tests/compat\") 'append)" \

Original file line number	Diff line number	Diff line change
`@@ -23,7 +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 which "$${EMACS}" \|\| which "emacs")`
	`26`	`+EMACS := $(shell which "$${EMACS}" 2> /dev/null \|\| which "emacs")`
`27`	`27`	`EMACS_VERSION := $(shell "$(EMACS)" -Q --batch --eval '(princ emacs-version)')`
`28`	`28`
`29`	`29`	`EFLAGS = --eval "(add-to-list 'load-path (expand-file-name \"tests/compat\") 'append)" \`