[iortcw] 150/497: All: Attempt 2 to fix versioning on a top-level checkout

[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 3a7426e254cf5aa3291ac2a96e79fde8997d8aa8
Author: M4N4T4RMS <M4N4T4RMS at e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Sun Jun 22 15:33:58 2014 +0000

    All: Attempt 2 to fix versioning on a top-level checkout
---
 MP/Makefile | 10 +++++-----
 SP/Makefile | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/MP/Makefile b/MP/Makefile
index dc89ff7..e3f9e8f 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -324,7 +324,7 @@ ifeq ($(USE_SVN),1)
       VERSION:=$(VERSION)_SVN$(SVN_REV)
     endif
   else
-  ifeq ($(wildcard ../../.svn),../../.svn)
+  ifeq ($(wildcard ../../../.svn),../../../.svn)
     SVN_REV=$(shell LANG=C svnversion .)
     ifneq ($(SVN_REV),)
       VERSION:=$(VERSION)_SVN$(SVN_REV)
@@ -2504,10 +2504,10 @@ ifeq ($(USE_SVN),1)
     $(B)/client/common.o : ../.svn/entries
     $(B)/ded/common.o : ../.svn/entries
   else
-  ifeq ($(wildcard ../../.svn),../../.svn)
-    $(B)/client/cl_console.o : ../../.svn/entries
-    $(B)/client/common.o : ../../.svn/entries
-    $(B)/ded/common.o : ../../.svn/entries
+  ifeq ($(wildcard ../../../.svn),../../../.svn)
+    $(B)/client/cl_console.o : ../../../.svn/entries
+    $(B)/client/common.o : ../../../.svn/entries
+    $(B)/ded/common.o : ../../../.svn/entries
   endif
   endif
 endif
diff --git a/SP/Makefile b/SP/Makefile
index 145ab50..7048222 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -321,7 +321,7 @@ ifeq ($(USE_SVN),1)
       VERSION:=$(VERSION)_SVN$(SVN_REV)
     endif
   else
-  ifeq ($(wildcard ../../.svn),../../.svn)
+  ifeq ($(wildcard ../../../.svn),../../../.svn)
     SVN_REV=$(shell LANG=C svnversion .)
     ifneq ($(SVN_REV),)
       VERSION:=$(VERSION)_SVN$(SVN_REV)
@@ -2515,10 +2515,10 @@ ifeq ($(USE_SVN),1)
     $(B)/client/common.o : ../.svn/entries
     $(B)/ded/common.o : ../.svn/entries
   else
-  ifeq ($(wildcard ../../.svn),../../.svn)
-    $(B)/client/cl_console.o : ../../.svn/entries
-    $(B)/client/common.o : ../../.svn/entries
-    $(B)/ded/common.o : ../../.svn/entries
+  ifeq ($(wildcard ../../../.svn),../../../.svn)
+    $(B)/client/cl_console.o : ../../../.svn/entries
+    $(B)/client/common.o : ../../../.svn/entries
+    $(B)/ded/common.o : ../../../.svn/entries
   endif
   endif
 endif

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