aboutsummaryrefslogtreecommitdiff
path: root/Makefile.common
diff options
context:
space:
mode:
authorJordi Vilalta Prat2011-02-12 16:43:57 +0000
committerJordi Vilalta Prat2011-02-12 16:43:57 +0000
commita4227638332c74d2e08e0935e7c49f276b701c61 (patch)
treeaed3e101fd5267dfa5e72f2654f64cad2c2296f9 /Makefile.common
parentc846231af3ccf9a910c5cfd5276a38a2244e325d (diff)
downloadscummvm-rg350-a4227638332c74d2e08e0935e7c49f276b701c61.tar.gz
scummvm-rg350-a4227638332c74d2e08e0935e7c49f276b701c61.tar.bz2
scummvm-rg350-a4227638332c74d2e08e0935e7c49f276b701c61.zip
BUILD: Remove explicit references to SVN in revision variable names.
svn-id: r55898
Diffstat (limited to 'Makefile.common')
-rw-r--r--Makefile.common16
1 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.common b/Makefile.common
index eb3165382f..1cb2936efe 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -168,9 +168,9 @@ VER_EXTRA = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c2-)
ifneq ($(shell svn info $(srcdir) 1>/dev/null 2>&1 || echo "error"),error)
SVNROOT := $(srcdir)
-ifeq ($(origin VER_SVNREV), undefined)
+ifeq ($(origin VER_REV), undefined)
# Get the working copy base revision
-VER_SVNREV := $(shell LANG=C svn info $(SVNROOT) | grep "^Revision" | cut -d ' ' -f 2)
+VER_REV := $(shell LANG=C svn info $(SVNROOT) | grep "^Revision" | cut -d ' ' -f 2)
endif
else
SVNROOT := https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/
@@ -178,8 +178,8 @@ endif
# Define the Subversion revision if available, either autodetected or
# specified by the user, but only for base/version.cpp.
-ifneq ($(origin VER_SVNREV), undefined)
-base/version.o: CXXFLAGS:=$(CXXFLAGS) -DSCUMMVM_SVN_REVISION=\"$(VER_SVNREV)\"
+ifneq ($(origin VER_REV), undefined)
+base/version.o: CXXFLAGS:=$(CXXFLAGS) -DSCUMMVM_REVISION=\"$(VER_REV)\"
endif
######################################################################
@@ -187,10 +187,10 @@ endif
######################################################################
ifeq ($(VER_EXTRA),svn)
-ifeq ($(origin VER_SVNREV), undefined)
+ifeq ($(origin VER_REV), undefined)
DISTVERSION = $(shell date '+%Y-%m-%d')
else
-DISTVERSION = svn$(VER_SVNREV)
+DISTVERSION = svn$(VER_REV)
endif
else
DISTVERSION = $(VERSION)
@@ -204,10 +204,10 @@ $(VERFILE): $(srcdir)/base/internal_version.h
@$(RM_REC) $(DISTDIR)
@$(MKDIR) $(DISTDIR)
svn export $(SVNROOT) $(DISTDIR)/$(DISTNAME)
-ifneq ($(origin VER_SVNREV), undefined)
+ifneq ($(origin VER_REV), undefined)
@# Use the current SVN revision as a default for the snapshot sources
@svn cat $(SVNROOT)/base/internal_version.h | sed -e \
- "s/^#define SCUMMVM_SVN_REVISION$$/#define SCUMMVM_SVN_REVISION \"$(VER_SVNREV)\"/g" \
+ "s/^#define SCUMMVM_REVISION$$/#define SCUMMVM_REVISION \"$(VER_REV)\"/g" \
> $(VERFILE)
endif