mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-01 06:30:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Nuke debian patch disable-git-version.diff.

Browse source 
Running:

$ git describe

in a code tree lacking dir .git (unpacked release tar-ball, for
example) throws an error:

	fatal: Not a git repository ...

and that's noise that can be avoided.

Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Cristian Ionescu-Idbohrn 2013-05-12 23:39:12 +02:00 committed by Dirk Hohndel
parent 0f389dd1c9
commit f7001929d0
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Makefile
View file

@ -34,13 +34,16 @@ STORED_VERSION_STRING = \
UNAME := $(shell $(CC) -dumpmachine 2>&1 | grep -E -o "linux|darwin|win|gnu|kfreebsd")
GET_VERSION = ./scripts/get-version
VERSION_STRING := $(shell $(GET_VERSION) linux || echo "v$(VERSION)")
VERSION_STRING := $(shell [ -d .git ] && $(GET_VERSION) linux || \
echo "v$(VERSION)")
# Mac Info.plist style with three numbers 1.2.3
CFBUNDLEVERSION_STRING := $(shell $(GET_VERSION) darwin $(VERSION_STRING) || \
echo "$(VERSION).0")
CFBUNDLEVERSION_STRING := $(shell [ -d .git ] && \
$(GET_VERSION) darwin $(VERSION_STRING) || \
echo "$(VERSION).0")
# Windows .nsi style with four numbers 1.2.3.4
PRODVERSION_STRING := $(shell $(GET_VERSION) win $(VERSION_STRING) || \
echo "$(VERSION).0.0")
PRODVERSION_STRING := $(shell [ -d .git ] && \
$(GET_VERSION) win $(VERSION_STRING) || \
echo "$(VERSION).0.0")
# find libdivecomputer
# First deal with the cross compile environment and with Mac.