diff options
| author | D G Turner | 2013-05-05 19:17:43 +0100 |
|---|---|---|
| committer | D G Turner | 2013-05-05 19:17:43 +0100 |
| commit | da1d4cc2a2d93f5257bb45fa56e8f30e0fdce260 (patch) | |
| tree | c437267e59e9e6e0170096a6928369f71e013c8f /Makefile.common | |
| parent | 52838980fcd941285e07a0e93ac33750c2280c7f (diff) | |
| download | scummvm-rg350-da1d4cc2a2d93f5257bb45fa56e8f30e0fdce260.tar.gz scummvm-rg350-da1d4cc2a2d93f5257bb45fa56e8f30e0fdce260.tar.bz2 scummvm-rg350-da1d4cc2a2d93f5257bb45fa56e8f30e0fdce260.zip | |
GIT: Fix build failures on new release tagging.
This occurs because previously when the current version was equal
to a tag i.e. v1.7.0, the output of git --describe was shortened.
This ensures that the output is of the form v1.7.0-0-gXXXXX even
when the revision is equal to the tag.
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.common b/Makefile.common index bfbfd67fb8..08ff411bb1 100644 --- a/Makefile.common +++ b/Makefile.common @@ -171,7 +171,7 @@ ifeq ($(origin VER_REV), undefined) # Are there uncommitted changes? (describe --dirty is only available since 1.6.6) VER_DIRTY := $(shell cd $(srcdir); git update-index --refresh --unmerged 1>/dev/null 2>&1; git diff-index --quiet HEAD || echo "-dirty") # Get the working copy base revision -VER_REV := $(shell cd $(srcdir); git describe --match desc/\* | cut -d '-' -f 2-)$(VER_DIRTY) +VER_REV := $(shell cd $(srcdir); git describe --long --match desc/\* | cut -d '-' -f 2-)$(VER_DIRTY) endif else GITROOT := git://github.com/scummvm/scummvm.git |