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 6d9a4e8812d20a2731f1a28525f8563c99b72c01
Author: M4N4T4RMS <M4N4T4RMS@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date: Sun Jun 22 15:21:11 2014 +0000
All: Attempt to fix versioning on a top-level checkout
---
MP/Makefile | 21 ++++++++++++++++++---
SP/Makefile | 21 ++++++++++++++++++---
2 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/MP/Makefile b/MP/Makefile
index 2051e89..dc89ff7 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -324,8 +324,15 @@ ifeq ($(USE_SVN),1)
VERSION:=$(VERSION)_SVN$(SVN_REV)
endif
else
+ ifeq ($(wildcard ../../.svn),../../.svn)
+ SVN_REV=$(shell LANG=C svnversion .)
+ ifneq ($(SVN_REV),)
+ VERSION:=$(VERSION)_SVN$(SVN_REV)
+ endif
+ else
USE_SVN=0
endif
+ endif
endif
@@ -2492,9 +2499,17 @@ $(B)/ded/%.o: $(NDIR)/%.c
# Extra dependencies to ensure the SVN version is incorporated
ifeq ($(USE_SVN),1)
- $(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
+ else
+ 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 911b0b3..145ab50 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -321,8 +321,15 @@ ifeq ($(USE_SVN),1)
VERSION:=$(VERSION)_SVN$(SVN_REV)
endif
else
+ ifeq ($(wildcard ../../.svn),../../.svn)
+ SVN_REV=$(shell LANG=C svnversion .)
+ ifneq ($(SVN_REV),)
+ VERSION:=$(VERSION)_SVN$(SVN_REV)
+ endif
+ else
USE_SVN=0
endif
+ endif
endif
@@ -2503,9 +2510,17 @@ $(B)/ded/%.o: $(NDIR)/%.c
# Extra dependencies to ensure the SVN version is incorporated
ifeq ($(USE_SVN),1)
- $(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
+ else
+ 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
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
