Makefiles determine OMK version by "git describe"

diff --git a/Makefile b/Makefile
index c2af4199ed96d5b07d71e1e56157ef0417b9ea16..ef2541eda365d3d33f6f9fdca9c9357ab1d360c3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ test tests:
 doc:
        $(MAKE) -C doc
 
-VERSION:=$(shell darcs changes --last=1|sed -ne '/tagged/ s/^ *tagged v\(.*\)/\1/p')
+VERSION:=$(shell git describe|sed -e 's/^v//')
 export VERSION                 # Export for doc/
 RELEASE_DIR := omk-$(VERSION)
 release: tag-check doc buildrules

diff --git a/doc/Makefile b/doc/Makefile
index 9f08bcee03338f6f017671e96d57accb07540f1d..7c62e97e7a896fac1ac959b68bdae1bad67b284f 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,5 +1,5 @@
 SOURCE = omk-manual
-VERSION ?= $(shell date +%Y-%m-%d)
+VERSION:=$(shell git describe|sed -e 's/^v//')
 
 .PHONY: FORCE