* Makefile.am (version.h): Add support for git-svn.

svn path=/trunk/mono/; revision=101536

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 77f4241b796165969f21f77ba01dd09d051068ab..e5dc98c62681567c4b55d463894b944c2b509a1e 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-23  Raja R Harinath  <harinath@hurrynot.org>
+
+       * Makefile.am (version.h): Add support for git-svn.
+
 2008-04-22  Zoltan Varga  <vargaz@gmail.com>
 
        * mini-exceptions.c (mono_handle_native_sigsegv): Rework the gdb calling code

diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am
index f2bc813f27d7353418a05ac30dda046bc47cd5ab..327df57233ed5fe3bf9b158cb2254495673d2e21 100644 (file)
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@ -494,15 +494,15 @@ EXTRA_DIST = $(common_BURGSRC) cprop.c TestDriver.cs ldscript ldscript.mono \
        $(hppa_sources) inssel-hppa.brg cpu-hppa.md
 
 version.h: Makefile
-       if test -d $(srcdir)/.svn; then \
-               (cd $(srcdir);  \
-                       LANG=C; \
-                       export LANG;    \
-                       branch=`svn info | grep URL | sed -e 's/.*source//' -e 's,mono/mono/mini,,'`; \
-                       version=`svn info | grep Revision | sed 's/.*: //'`; \
+       if test -d $(top_srcdir)/.git/svn; then svn_info='git svn info'; fi; \
+       if test -d $(srcdir)/.svn; then svn_info='svn info'; fi; \
+       if test -n "$$svn_info"; then \
+               (cd $(top_srcdir); \
+                       LANG=C; export LANG; \
+                       branch=`$$svn_info | grep URL | sed -e 's/.*source//' -e 's,mono$$,,'`; \
+                       version=`$$svn_info | grep Revision | sed 's/.*: //'`; \
                        echo "#define FULL_VERSION \"$$branch r$$version\""; \
                ); \
        else \
                echo "#define FULL_VERSION \"tarball\""; \
        fi > version.h
-