r1425 - trunk

[DONOTREPLY at icculus.org]

Author: ludwig
Date: 2008-07-16 03:14:55 -0400 (Wed, 16 Jul 2008)
New Revision: 1425

Modified:
   trunk/Makefile
Log:
also define proper version when using git-svn

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2008-07-12 13:31:31 UTC (rev 1424)
+++ trunk/Makefile	2008-07-16 07:14:55 UTC (rev 1425)
@@ -193,7 +193,14 @@
     VERSION:=$(VERSION)_SVN$(SVN_REV)
     USE_SVN=1
   endif
+else
+ifeq ($(wildcard .git/svn/.metadata),.git/svn/.metadata)
+  SVN_REV=$(shell LANG=C git-svn info | awk '$$1 == "Revision:" {print $$2; exit 0}')
+  ifneq ($(SVN_REV),)
+    VERSION:=$(VERSION)_SVN$(SVN_REV)
+  endif
 endif
+endif
 
 
 #############################################################################