From 0140cf62abb159a2f8d3e07e02b5c03198a5c3c1 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Sat, 6 Apr 2013 12:38:25 -0700 Subject: [PATCH] don't require that hacky last_release tag for PATCHLEVEL, needs more thought --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index fa61eaacc..e26beb80e 100644 --- a/Makefile +++ b/Makefile @@ -94,9 +94,10 @@ VERSIONFILE=VERSION # two or three-part version string, whatever's in VERSION VERSION:=$(shell cat $(VERSIONFILE)) -# the number of changes recorded since last tag in this repo -#PATCHLEVEL:=$(shell expr `git describe --long | awk -F - '{print $$2}' `) -PATCHLEVEL:=$(shell git rev-list last_release..HEAD | wc -l) +# the number of commits since the last tag +PATCHLEVEL:=$(shell expr `git describe --long | awk -F - '{print $$2}' `) +# the number of commits since the last_release tag +#PATCHLEVEL:=$(shell git rev-list last_release..HEAD | wc -l) # build flags WARNINGS:=-W -fwarn-tabs -fno-warn-unused-do-bind -fno-warn-name-shadowing #-fwarn-orphans -fwarn-simple-patterns -fwarn-monomorphism-restriction