From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 21 Mar 2019 08:29:29 +0000 (+0700)
Subject: Avoid spurious output from which when we don't have docker or pandoc
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7a86039d9364eec8df3c8a6396ed8ebda3d33c1;p=thirdparty%2Ffreeradius-server.git

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

diff --git a/Makefile b/Makefile
index c72887d3f73..f05205c92ee 100644
--- 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 c0cd1dedf52..a72922b992c 100644
--- 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