From f7001929d0a999ba60f2d1a71a0ecdba6396cc10 Mon Sep 17 00:00:00 2001 From: Cristian Ionescu-Idbohrn Date: Sun, 12 May 2013 23:39:12 +0200 Subject: [PATCH] Nuke debian patch disable-git-version.diff. 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 Signed-off-by: Dirk Hohndel --- Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 7ff9a6eab..c87b957c2 100644 --- a/Makefile +++ b/Makefile @@ -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.