From: terencehill <piuntn@gmail.com>
Date: Mon, 28 Aug 2017 12:36:29 +0000 (+0200)
Subject: Suppress error output of "which"
X-Git-Tag: xonotic-v0.8.5~2491
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2c2a008a2c1b25d47a81f5d7836a510d4643273a;p=xonotic%2Fxonotic-data.pk3dir.git

Suppress error output of "which"
---

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index bd17dad6a..bfea08b5f 100644
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -14,17 +14,17 @@ ENABLE_DEBUGTRACE ?= 0
 BUILD_MOD ?=
 
 ifndef ZIP
-	ifneq ($(shell which zip),)
+	ifneq ($(shell which zip 2>/dev/null),)
 		ZIP := zip -9
 	endif
-	ifneq ($(shell which 7z),)
+	ifneq ($(shell which 7z 2>/dev/null),)
 		ZIP := 7z a -tzip -mx=9
 	endif
-	ifneq ($(shell which 7za),)
+	ifneq ($(shell which 7za 2>/dev/null),)
 		ZIP := 7za a -tzip -mx=9
 	endif
     ifndef ZIP
-        $(warning "No zip in ($(PATH))")
+        $(warning "No zip / 7z / 7za in ($(PATH))")
         ZIP := : zip_not_found
     endif
 endif