Merge branch 'martin-t/warns' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / Makefile

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index 2941f6320692a46f7932af0e163a741bb2d9c1e5..d09b2c5ccffa730255a6545d0f411a11adc05fc5 100644 (file)
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -14,17 +14,17 @@ ENABLE_DEBUGTRACE ?= 0
 BUILD_MOD ?=
 
 ifndef ZIP
 BUILD_MOD ?=
 
 ifndef ZIP

-       ifneq ($(shell which zip),)
+       ifneq ($(shell which zip 2>/dev/null),)

                ZIP := zip -9
        endif
                ZIP := zip -9
        endif

-       ifneq ($(shell which 7z),)
+       ifneq ($(shell which 7z 2>/dev/null),)

                ZIP := 7z a -tzip -mx=9
        endif
                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
                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
         ZIP := : zip_not_found
     endif
 endif