From dcebd2c540594c55277e0da6d4c9c6e9215de9b6 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Fri, 18 Oct 2013 15:10:14 -0500 Subject: [PATCH] Use git version to get version name Using git version is simpler as it handles oddball cases internally. Since we have been using mostly lightweight tags I have set it to search those in addition to annotated tags for the best match. The output for commits that don't have a tag seems a bit nicer as well. Conflicts: Makefile --- Makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index ca8011b..c1f57d1 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,5 @@ -# Get the version name first by seeing if HEAD is tagged -version := $(shell git tag --points-at HEAD -l '0.*.*' | head -1) -# And if it wasn't use a git hash -ifeq ($(version),) - version := $(shell git log -1 --abbrev=8 --pretty=git%h) -endif +# Get a version name based off the nearest tag (include lightweight tags) +version := $(shell git describe --tags) DESTDIR := /usr