shells are too stupid to understand precedence of && and ||, so let's group explicitly

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11089 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=e1561444a7528d17961958a23bf9bc64007c8355

diff --git a/makefile.inc b/makefile.inc
index 341831fc448d7ad007f85c062ed9c2091c698eca..6bb61ba29121e8ca99ed3cbf5be577d73c117e53 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -209,9 +209,9 @@ DO_CC=$(CC) $(CFLAGS) -c $< -o $@
 
 
 # Link
-LDFLAGS_DEBUG=-g -ggdb $(OPTIM_DEBUG) -DSVNREVISION=`test -d .svn && svnversion || test -d .git && git describe || echo -` -DBUILDTYPE=debug
-LDFLAGS_PROFILE=-g -pg -fprofile-arcs $(OPTIM_RELEASE) -DSVNREVISION=`test -d .svn && svnversion || test -d .git && git describe || echo -` -DBUILDTYPE=profile
-LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`test -d .svn && svnversion || test -d .git && git describe || echo -` -DBUILDTYPE=release
+LDFLAGS_DEBUG=-g -ggdb $(OPTIM_DEBUG) -DSVNREVISION=`{ test -d .svn && svnversion; } || { test -d .git && git describe; } || echo -` -DBUILDTYPE=debug
+LDFLAGS_PROFILE=-g -pg -fprofile-arcs $(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; } || { test -d .git && git describe; } || echo -` -DBUILDTYPE=profile
+LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; } || { test -d .git && git describe; } || echo -` -DBUILDTYPE=release
 
 
 ##### UNIX specific variables #####