[iortcw] 147/497: All: Fix USE_SVN define in Makefile (for version string)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 112b0135df346e329f56428bcbd479b4ffa29f87
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Sat Jun 21 11:47:15 2014 +0000

    All: Fix USE_SVN define in Makefile (for version string)
---
 MP/Makefile | 28 ++++++++++++++++------------
 SP/Makefile | 28 ++++++++++++++++------------
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/MP/Makefile b/MP/Makefile
index 454ef88..921b00d 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -239,6 +239,10 @@ ifndef DEBUG_CFLAGS
 DEBUG_CFLAGS=-g -O0
 endif
 
+ifndef USE_SVN
+USE_SVN=1
+endif
+
 ifndef USE_ANTIWALLHACK
 USE_ANTIWALLHACK=0
 endif
@@ -313,21 +317,21 @@ ifneq ($(BUILD_CLIENT),0)
 endif
 
 # Add svn version info
-USE_SVN=
-ifeq ($(wildcard .svn),.svn)
-  SVN_REV=$(shell LANG=C svnversion .)
-  ifneq ($(SVN_REV),)
-    VERSION:=$(VERSION)_SVN$(SVN_REV)
-    USE_SVN=1
+ifeq ($(USE_SVN),1)
+  ifeq ($(wildcard .svn),.svn)
+    SVN_REV=$(shell LANG=C svnversion .)
+    ifneq ($(SVN_REV),)
+      VERSION:=$(VERSION)_SVN$(SVN_REV)
+    endif
+  else
+  ifeq ($(wildcard .git/svn/.metadata),.git/svn/.metadata)
+    SVN_REV=$(shell LANG=C git svn info | awk '$$1 == "Revision:" {print $$2; exit 0}')
+    ifneq ($(SVN_REV),)
+      VERSION:=$(VERSION)_SVN$(SVN_REV)
+    endif
   endif
-else
-ifeq ($(wildcard .git/svn/.metadata),.git/svn/.metadata)
-  SVN_REV=$(shell LANG=C git svn info | awk '$$1 == "Revision:" {print $$2; exit 0}')
-  ifneq ($(SVN_REV),)
-    VERSION:=$(VERSION)_SVN$(SVN_REV)
   endif
 endif
-endif
 
 
 #############################################################################
diff --git a/SP/Makefile b/SP/Makefile
index d2d05c5..3f0e35c 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -239,6 +239,10 @@ ifndef DEBUG_CFLAGS
 DEBUG_CFLAGS=-g -O0
 endif
 
+ifndef USE_SVN
+USE_SVN=1
+endif
+
 ifndef USE_BLOOM
 USE_BLOOM=1
 endif
@@ -310,21 +314,21 @@ ifneq ($(BUILD_CLIENT),0)
 endif
 
 # Add svn version info
-USE_SVN=
-ifeq ($(wildcard .svn),.svn)
-  SVN_REV=$(shell LANG=C svnversion .)
-  ifneq ($(SVN_REV),)
-    VERSION:=$(VERSION)_SVN$(SVN_REV)
-    USE_SVN=1
+ifeq ($(USE_SVN),1)
+  ifeq ($(wildcard .svn),.svn)
+    SVN_REV=$(shell LANG=C svnversion .)
+    ifneq ($(SVN_REV),)
+      VERSION:=$(VERSION)_SVN$(SVN_REV)
+    endif
+  else
+  ifeq ($(wildcard .git/svn/.metadata),.git/svn/.metadata)
+    SVN_REV=$(shell LANG=C git svn info | awk '$$1 == "Revision:" {print $$2; exit 0}')
+    ifneq ($(SVN_REV),)
+      VERSION:=$(VERSION)_SVN$(SVN_REV)
+    endif
   endif
-else
-ifeq ($(wildcard .git/svn/.metadata),.git/svn/.metadata)
-  SVN_REV=$(shell LANG=C git svn info | awk '$$1 == "Revision:" {print $$2; exit 0}')
-  ifneq ($(SVN_REV),)
-    VERSION:=$(VERSION)_SVN$(SVN_REV)
   endif
 endif
-endif
 
 
 #############################################################################

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git