Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index 69e3105e3afaced874db4b91b4cdca5a933b8e31..538a44bacc4645cbbb144043966a40523d25b90b 100644 (file)
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -3,7 +3,7 @@ PERL ?= perl
 QCCFLAGS_WATERMARK ?= -DWATERMARK='"$(shell git describe)"' -DCVAR_POPCON=1
 QCC ?= fteqcc
 
-VERSION_MESSAGE = $(shell $(QCC) --version --help)
+VERSION_MESSAGE = $(shell cd server && $(QCC) --version --help)
 ifneq (,$(findstring GMQCC,$(VERSION_MESSAGE)))
 # this is gmqcc
 QCCFLAGS ?= \