From: Harald Hoyer <harald@redhat.com>
Date: Wed, 30 Sep 2015 12:10:05 +0000 (+0200)
Subject: Makefile: fix VERSION and GITVERSION
X-Git-Tag: 044~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8019e0eef3d36a4933ab96a8a8edfef5f3685593;p=thirdparty%2Fdracut.git

Makefile: fix VERSION and GITVERSION
---

diff --git a/Makefile b/Makefile
index f3a5c07da..8454c6370 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 -include dracut-version.sh
 
-VERSION = $(shell [ -d .git ] && git describe --abbrev=0 --tags 2>/dev/null || echo $(DRACUT_VERSION))
-GITVERSION = $(shell [ -d .git ] && { v=$$(git describe --tags 2>/dev/null); [ $${v\#*-} != $$v ] && echo -$${v\#*-}; } )
+VERSION ?= $(shell [ -d .git ] && git describe --abbrev=0 --tags 2>/dev/null || echo $(DRACUT_VERSION))
+GITVERSION ?= $(shell [ -d .git ] && { v=$$(git describe --tags 2>/dev/null); [ -n "$$v" ] && [ $${v\#*-} != $$v ] && echo -$${v\#*-}; } )
 
 -include Makefile.inc