[nexuiz-commits] r6334 - trunk/data

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-27 15:13:42 -0400 (Fri, 27 Mar 2009)
New Revision: 6334

Modified:
   trunk/data/Makefile
Log:
remove some stuff in case the build system is used


Modified: trunk/data/Makefile
===================================================================
--- trunk/data/Makefile	2009-03-27 18:16:42 UTC (rev 6333)
+++ trunk/data/Makefile	2009-03-27 19:13:42 UTC (rev 6334)
@@ -12,12 +12,16 @@
 # It will automagically add an engine check with -TID and then change back to -TFTE
 FTEQCCFLAGS_CSPROGS ?= 
 
+# nexuiz svn build system overrides this by command line argument
+NEX_BUILDSYSTEM =
+
 all: qc
 
 .PHONY: update-cvarcount
 update-cvarcount:
-	! [ -f ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def ] || diff ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def scripts/entities.def || { echo entities.def mismatch, please merge ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def and scripts/entities.def; exit 1; }
-	DO_NOT_RUN_MAKE=1 sh update-cvarcount.sh
+	[ "$(NEX_BUILDSYSTEM)" = "" ] || [ "$(NEX_BUILDSYSTEM)" = "1" ]
+	[ "$(NEX_BUILDSYSTEM)" != "" ] || { ! [ -f ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def ] || diff ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def scripts/entities.def || { echo entities.def mismatch, please merge ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def and scripts/entities.def; exit 1; } }
+	[ "$(NEX_BUILDSYSTEM)" != "" ] || { DO_NOT_RUN_MAKE=1 sh update-cvarcount.sh; }
 
 .PHONY: qc
 qc: menu.dat progs.dat csprogs.dat