From: Rudolf Polzer <divVerent@alientrap.org>
Date: Fri, 6 Aug 2010 10:00:05 +0000 (+0200)
Subject: NEX_BUILDSYSTEM -> XON_BUILDSYSTEM
X-Git-Tag: xonotic-v0.1.0preview~266^2~9^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d113546c4d5b02a94aea02998578ad53e74acf60;p=xonotic%2Fxonotic-data.pk3dir.git

NEX_BUILDSYSTEM -> XON_BUILDSYSTEM
---

diff --git a/Makefile b/Makefile
index 313fb8402..99478f084 100644
--- a/Makefile
+++ b/Makefile
@@ -15,16 +15,15 @@ FTEQCCFLAGS_MENU ?=
 # It will automagically add an engine check with -TID and then change back to -TFTE
 FTEQCCFLAGS_CSPROGS ?= 
 
-# xonotic svn build system overrides this by command line argument
-NEX_BUILDSYSTEM =
+# xonotic build system overrides this by command line argument to turn off the update-cvarcount step
+XON_BUILDSYSTEM =
 
 all: qc
 
 .PHONY: update-cvarcount
 update-cvarcount:
-	[ "$(NEX_BUILDSYSTEM)" = "" ] || [ "$(NEX_BUILDSYSTEM)" = "1" ]
-	[ "$(NEX_BUILDSYSTEM)" != "" ] || { ! [ -f ../misc/netradiant-XonoticPack/xonotic.game/data/entities.def ] || $(DIFF) scripts/entities.def ../misc/netradiant-XonoticPack/xonotic.game/data/entities.def || { echo entities.def mismatch, please merge ../misc/netradiant-XonoticPack/xonotic.game/data/entities.def and scripts/entities.def; exit 1; }; }
-	[ "$(NEX_BUILDSYSTEM)" != "" ] || { DO_NOT_RUN_MAKE=1 sh update-cvarcount.sh; }
+	[ "$(XON_BUILDSYSTEM)" = "" ] || [ "$(XON_BUILDSYSTEM)" = "1" ]
+	[ "$(XON_BUILDSYSTEM)" = "1" ] || { DO_NOT_RUN_MAKE=1 sh update-cvarcount.sh; }
 
 .PHONY: qc
 qc: update-cvarcount