Use 'git describe' to generate the git version string

diff --git a/wscript b/wscript
index c21dc807f5c1e2d6f3413374c959cb85a4ab3692..ae358ab834d1c3fb4c3e7dcd420456a1305e68ba 100644 (file)
--- a/wscript
+++ b/wscript
@@ -35,9 +35,9 @@ APPNAME = 'midori'
 VERSION = str (major) + '.' + str (minor) + '.' + str (micro)
 
 try:
-    git = Utils.cmd_output (['git', 'rev-parse', '--short', 'HEAD'], silent=True)
+    git = Utils.cmd_output (['git', 'describe'], silent=True)
     if git:
-        VERSION = (VERSION + '-' + git).strip ()
+        VERSION = git
 except:
     pass