[iortcw] 313/497: All: Fix the GIT versioning

[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 ece10a2034681b78b4da744eb3e25621fd654031
Author: MAN-AT-ARMS <man-at-arms at comcast.net>
Date:   Thu Mar 12 16:48:17 2015 -0400

    All: Fix the GIT versioning
---
 MP/Makefile | 8 ++++----
 SP/Makefile | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/MP/Makefile b/MP/Makefile
index 840cdd7..56e1eef 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -330,7 +330,7 @@ endif
 
 # Add git version info
 USE_GIT=
-ifeq ($(wildcard .git),.git)
+ifeq ($(wildcard ../.git),../.git)
   GIT_REV=$(shell git show -s --pretty=format:%h-%ad --date=short)
   ifneq ($(GIT_REV),)
     VERSION:=$(VERSION)_GIT_$(GIT_REV)
@@ -2598,9 +2598,9 @@ $(B)/ded/%.o: $(NDIR)/%.c
 
 # Extra dependencies to ensure the git version is incorporated
 ifeq ($(USE_GIT),1)
-  $(B)/client/cl_console.o : .git/index
-  $(B)/client/common.o : .git/index
-  $(B)/ded/common.o : .git/index
+  $(B)/client/cl_console.o : ../.git/index
+  $(B)/client/common.o : ../.git/index
+  $(B)/ded/common.o : ../.git/index
 endif
 
 
diff --git a/SP/Makefile b/SP/Makefile
index 855f2b6..64450ca 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -322,7 +322,7 @@ endif
 
 # Add git version info
 USE_GIT=
-ifeq ($(wildcard .git),.git)
+ifeq ($(wildcard ../.git),../.git)
   GIT_REV=$(shell git show -s --pretty=format:%h-%ad --date=short)
   ifneq ($(GIT_REV),)
     VERSION:=$(VERSION)_GIT_$(GIT_REV)
@@ -2571,9 +2571,9 @@ $(B)/ded/%.o: $(NDIR)/%.c
 
 # Extra dependencies to ensure the git version is incorporated
 ifeq ($(USE_GIT),1)
-  $(B)/client/cl_console.o : .git/index
-  $(B)/client/common.o : .git/index
-  $(B)/ded/common.o : .git/index
+  $(B)/client/cl_console.o : ../.git/index
+  $(B)/client/common.o : ../.git/index
+  $(B)/ded/common.o : ../.git/index
 endif
 
 

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