From 88cc801efbdb49be4e7da25187b05bbb5daf190f Mon Sep 17 00:00:00 2001 From: lephisto Date: Fri, 17 Apr 2015 14:44:06 +0200 Subject: [PATCH] Update Makefile change image filename --- Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ea8ea78..1b37ce4 100644 --- a/Makefile +++ b/Makefile @@ -4,12 +4,10 @@ GLUON_GIT_REF := v2014.4 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key -_GIT_DESCRIBE = $(shell git describe --tags 2>/dev/null) -ifneq (,${_GIT_DESCRIBE}) - GLUON_RELEASE := ${_GIT_DESCRIBE} +GLUON_RELEASE := $(shell git describe --tags 2>/dev/null) +ifneq (,$(shell git describe --exact-match --tags 2>/dev/null)) GLUON_BRANCH := stable else - GLUON_RELEASE ?= ffrgb-snapshot~$(shell date '+%Y%m%d')~$(shell git describe --always) GLUON_BRANCH := experimental endif