From f4210298adf0950c5ee41d8cc7026db7ba8b1821 Mon Sep 17 00:00:00 2001 From: Timo Teras Date: Tue, 14 Apr 2009 08:56:06 +0300 Subject: build: use version from git describe if available --- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index bf16a44..d656c34 100644 --- a/Makefile +++ b/Makefile @@ -10,9 +10,13 @@ PACKAGE := apk-tools VERSION := 2.0_pre10 -SVN_REV := $(shell svn info 2> /dev/null | grep ^Revision | cut -d ' ' -f 2) -ifneq ($(SVN_REV),) -FULL_VERSION := $(VERSION)-r$(SVN_REV) +GIT_REV := $(shell git describe || echo exported) +ifneq ($(GIT_REV), exported) +ifneq ($(filter apk-tools-$(VERSION)%, $(GIT_REV)),) +FULL_VERSION := $(patsubst apk-tools-%,%,$(GIT_REV)) +else +FULL_VERSION := $(GIT_REV) +endif else FULL_VERSION := $(VERSION) endif -- cgit v1.2.3-70-g09d2