Merge branch 'packer/cached-converter' into 'master'

[xonotic/xonotic.git] / Makefile

diff --git a/Makefile b/Makefile
index 72c166777556653686b746b591b880a2ef59d047..85fbe91883680894b6d8c2e0e81e51d2287a92e1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DESTDIR ?= 
+DESTDIR ?=
 PREFIX ?= /usr/local
 BINDIR ?= $(PREFIX)/bin
 LIBDIR ?= $(PREFIX)/lib/xonotic
@@ -19,7 +19,7 @@ all: all-$(SUFFIX)
 
 .PHONY: all-git
 all-git:
-       ./all compile -r
+       ./all compile
 
 .PHONY: all-zip-binary
 all-zip-binary:
@@ -30,7 +30,7 @@ all-zip-source:
        ( cd source/d0_blind_id && ./configure --enable-static --disable-shared $(RIJNDAELDETECT_CONFIGURE) )
        $(MAKE) -C source/d0_blind_id
        $(MAKE) -C source/gmqcc
-       $(MAKE) -C source/qcsrc FTEQCC=$(CURDIR)/source/gmqcc/gmqcc
+       $(MAKE) -C source/qcsrc QCC=$(CURDIR)/source/gmqcc/gmqcc
        $(MAKE) -C source/darkplaces sv-release DP_CRYPTO_STATIC_LIBDIR=$(CURDIR)/source/d0_blind_id/.libs
        $(MAKE) -C source/darkplaces cl-release DP_CRYPTO_STATIC_LIBDIR=$(CURDIR)/source/d0_blind_id/.libs
        $(MAKE) -C source/darkplaces sdl-release DP_CRYPTO_STATIC_LIBDIR=$(CURDIR)/source/d0_blind_id/.libs
@@ -49,7 +49,7 @@ clean-zip-binary:
 
 .PHONY: clean-zip
 clean-zip-source:
-       -$(MAKE) -C source/d0_blind_id distclean
+       $(MAKE) -C source/d0_blind_id distclean
        $(MAKE) -C source/gmqcc clean
        $(MAKE) -C source/qcsrc clean
        $(MAKE) -C source/darkplaces clean