From e21400f085c298aa23c49e01bd5c418d1473e81f Mon Sep 17 00:00:00 2001 From: dannybackx Date: Mon, 5 Jun 2017 11:19:56 +0200 Subject: [PATCH] Allow to overrule the build tag from local.conf if you're not in a git tree. --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5ee3949..4a10ae9 100644 --- a/Makefile +++ b/Makefile @@ -189,7 +189,8 @@ endif TRAVIS_BRANCH?=$(shell git symbolic-ref --short HEAD --quiet) # Use git describe to get the latest version tag, commits since then, sha and dirty flag, this # results is something like "v1.2.0-13-ab6cedf-dirty" -VERSION := $(shell (git describe --tags --match 'v*' --long --dirty || echo "no-tag") | sed -re 's/(\.0)?-/./') +NO_TAG ?= "no-tag" +VERSION := $(shell (git describe --tags --match 'v*' --long --dirty || echo $(NO_TAG)) | sed -re 's/(\.0)?-/./') # If not on master then insert the branch name ifneq ($(TRAVIS_BRANCH),master) ifneq ($(findstring V%,$(TRAVIS_BRANCH)),)