From d113546c4d5b02a94aea02998578ad53e74acf60 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Fri, 6 Aug 2010 12:00:05 +0200 Subject: [PATCH] NEX_BUILDSYSTEM -> XON_BUILDSYSTEM --- Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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 -- 2.39.2