commit b0ae0fefe7813faeac90c0f827ebfff3318c019a
author Michael Marchetti <mmarchetti@sandvine.com> Fri Aug 03 15:19:25 2018 +0200
committer Michael Marchetti <mmarchetti@sandvine.com> Fri Aug 03 15:24:52 2018 +0200
tree a7b3cce32bbfde21e988890d9f10e0288a65e75f
parent bd15be43bbfba5de91e82c78228e3c40d9a7898b

Restrict git describe to tags matching v*

Signed-off-by: Michael Marchetti <mmarchetti@sandvine.com>

Makefile

diff --git a/Makefile b/Makefile
index 553d349..95d8970 100644
--- a/Makefile
+++ b/Makefile
@@ -24,9 +24,9 @@
 prepare_lite:
 	#pip install --user --upgrade setuptools
 	mkdir -p build
-	#VER1=$(shell git describe | sed -e 's/^v//' |cut -d- -f1); \
-	#VER2=$(shell git describe | cut -d- -f2); \
-	#VER3=$(shell git describe | cut -d- -f3); \
+	#VER1=$(shell git describe --match v*| sed -e 's/^v//' |cut -d- -f1); \
+	#VER2=$(shell git describe --match v*| cut -d- -f2); \
+	#VER3=$(shell git describe --match v*| cut -d- -f3); \
 	#echo "$$VER1.dev$$VER2+$$VER3" > build/OVIM_VERSION
 	cp tox.ini build/
 	cp MANIFEST.in build/
@@ -52,9 +52,9 @@
 prepare:
 	#pip install --user --upgrade setuptools
 	mkdir -p build
-	#VER1=$(shell git describe | sed -e 's/^v//' |cut -d- -f1); \
-	#VER2=$(shell git describe | cut -d- -f2); \
-	#VER3=$(shell git describe | cut -d- -f3); \
+	#VER1=$(shell git describe --match v*| sed -e 's/^v//' |cut -d- -f1); \
+	#VER2=$(shell git describe --match v*| cut -d- -f2); \
+	#VER3=$(shell git describe --match v*| cut -d- -f3); \
 	#echo "$$VER1.dev$$VER2+$$VER3" > build/OPENVIM_VERSION
 	cp tox.ini build/
 	cp MANIFEST.in build/