7 files changed, 27 insertions, 16 deletions

diff --git a/.gitignore b/.gitignore
index c4c9ac3..5664962 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 # Files I don't care to see in git-status/commit
 cgit
+VERSION
 *.o
 *~
diff --git a/Makefile b/Makefile
index c2a5736..e69ad7e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,3 @@
-CGIT_VERSION = 0.5
-
 prefix = /var/www/htdocs/cgit
-
 SHA1_HEADER = <openssl/sha.h>
 CACHE_ROOT = /var/cache/cgit
@@ -13,4 +10,15 @@ CGIT_SCRIPT_NAME = cgit.cgi
 -include cgit.conf
 
+
+CGIT_VERSION = 0.5
+
+all: cgit
+
+VERSION:
+	gen-version.sh
+
+-include VERSION
+
+
 EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
 OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
@@ -43,10 +51,5 @@ endif
 
 
-#
-# basic build rules
-#
-all: cgit
-
-cgit: cgit.c cgit.h $(OBJECTS)
+cgit: cgit.c cgit.h VERSION $(OBJECTS)
 	$(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
 
@@ -66,5 +69,5 @@ install: all clean-cache
 
 clean-cgit:
-	rm -f cgit *.o
+	rm -f cgit VERSION *.o
 
 distclean-cgit: clean-cgit
@@ -84,4 +87,8 @@ clean: clean-cgit clean-sub
 distclean: distclean-cgit distclean-sub
 
+version: clean-cgit
+	./gen-version.sh
+	make
+
 .PHONY: all install clean clean-cgit clean-sub clean-cache \
-	distclean distclean-cgit distclean-sub
+	distclean distclean-cgit distclean-sub release version
diff --git a/cgit.c b/cgit.c
index b943fe5..d9a03c2 100644
--- a/cgit.c
+++ b/cgit.c
@@ -9,7 +9,4 @@
 #include "cgit.h"
 
-const char cgit_version[] = CGIT_VERSION;
-
-
 static int cgit_prepare_cache(struct cacheitem *item)
 {
diff --git a/cgit.h b/cgit.h
index a59a370..2ff5340 100644
--- a/cgit.h
+++ b/cgit.h
@@ -99,5 +99,5 @@ struct taginfo {
 };
 
-extern const char cgit_version[];
+extern const char *cgit_version;
 
 extern struct repolist cgit_repolist;
diff --git a/gen-version.sh b/gen-version.sh
new file mode 100755
index 0000000..4c60f60
--- a/dev/null
+++ b/gen-version.sh
@@ -0,0 +1,4 @@
+v=$(git-describe --abbrev=4 HEAD | sed -e 's/-/./g')
+test -z "$v" && exit 1
+echo "CGIT_VERSION = $v"
+echo "CGIT_VERSION = $v" > VERSION
diff --git a/shared.c b/shared.c
index 45db735..1a5b866 100644
--- a/shared.c
+++ b/shared.c
@@ -13,4 +13,6 @@ struct repoinfo *cgit_repo;
 int cgit_cmd;
 
+const char *cgit_version = CGIT_VERSION;
+
 char *cgit_root_title   = "Git repository browser";
 char *cgit_css          = "/cgit.css";
diff --git a/ui-shared.c b/ui-shared.c
index bfcc2ac..d4376ce 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -283,5 +283,5 @@ void cgit_print_docstart(char *title, struct cacheitem *item)
 	html_txt(title);
 	html("</title>\n");
-	htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version);
+	htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
 	html("<link rel='stylesheet' type='text/css' href='");
 	html_attr(cgit_css);