Avoid spurious output from which when we don't have docker or pandoc

diff --git a/Makefile b/Makefile
index c72887d3f73c9a2a92b82038c9ca3ab890a5cb7f..f05205c92ee21d314bb313469773db5603107e83 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -360,7 +360,7 @@ whitespace:
 #  Include crossbuild targets, to test building on lots of
 #  different OSes. Uses Docker.
 #
-ifneq ($(shell which docker),)
+ifneq ($(shell which docker 2> /dev/null),)
 include scripts/docker/crossbuild/crossbuild.mk
 else
 .PHONY: crossbuild crossbuild.help

diff --git a/doc/all.mk b/doc/all.mk
index c0cd1dedf524b680f64b3916917f020b5bedfa63..a72922b992cf52b392b533199cdb4429201f95af 100644 (file)
--- a/doc/all.mk
+++ b/doc/all.mk
@@ -43,7 +43,7 @@ clean.doc:
 #  Pandoc v2 onwards renamed --latex-engine to --pdf-engine
 #
 PANDOC_ENGINE=pdf
-ifneq ($(shell which pandoc),)
+ifneq ($(shell which pandoc 2> /dev/null),)
 ifneq ($(shell pandoc --help | grep latex-engine),)
 PANDOC_ENGINE=latex
 endif