From e1f5023e307b2337ac8689534bec6d12859af3e5 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Thu, 3 Sep 2015 12:24:35 -0700
Subject: [PATCH] tools: more PATCHLEVEL/git-describe fixes

---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1b76c4d11..6bf8a1aba 100644
--- a/Makefile
+++ b/Makefile
@@ -148,7 +148,9 @@ VERSIONFILE=.version
 VERSION:=$(shell cat $(VERSIONFILE))
 
 # the number of commits since the last tag
-PATCHLEVEL:=$(shell git describe --tags | awk -F - '{print $$2}')
+#DESCRIBE:=$(shell git describe --tags --match 'hledger-[0-9]*' --dirty )
+PATCHLEVEL:=$(shell git describe --tags --match 'hledger-[0-9]*' --long | awk -F- '{print $$3}')
+#PATCHLEVEL:=$(shell git describe --tags --match 'hledger-web-[0-9]*' --long | awk -F- '{print $$4}')
 # the number of commits since the last_release tag
 #PATCHLEVEL:=$(shell git rev-list last_release..HEAD | wc -l)