]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Suppress error output of "which"
authorterencehill <piuntn@gmail.com>
Mon, 28 Aug 2017 12:36:29 +0000 (14:36 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 28 Aug 2017 12:36:29 +0000 (14:36 +0200)
qcsrc/Makefile

index bd17dad6aaf5e93c0c729891009cfedfa85ca258..bfea08b5f92df070fbcc59269b5ec65ed7bb3162 100644 (file)
@@ -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