Add git svnversion.h generation code

Signed-off-by: Russell Harmon <eatnumber1@gmail.com>
Switch from `` to POSIX preferred (and more readable) $()

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3224 0192ed92-7a03-0410-a25b-9323aeb14dbd

diff --git a/Makefile b/Makefile
index a390b2fd02416ac72b2376d3535a5e1070f5cdde..586bb905093029f195bcca0861b11ef81a97126b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -66,10 +66,13 @@ endif
 .PHONY: svnversion.h
 svnversion.h:
        @if [ -d .svn ]; then \
-               ver=`svnversion -nc . | sed -e 's/^[^:]*://;s/[A-Za-z]//'`; \
+               ver=$(svnversion -nc . | sed -e 's/^[^:]*://;s/[A-Za-z]//'); \
                echo "#define SVNVERSION \"svn r$$ver\"" > $@.tmp; \
+       elif [ -d .git ]; then \
+               ver=$(git svn log | head -n2 | tail -n1 | cut -d\  -f1); \
+               echo "#define SVNVERSION \"svn $$ver\"" > $@.tmp; \
        elif [ -s SNAPSHOT ]; then \
-               ver=`sed -e '/^Revision: */!d;s///;q' SNAPSHOT`; \
+               ver=$(sed -e '/^Revision: */!d;s///;q' SNAPSHOT); \
                echo "#define SVNVERSION \"svn r$$ver\"" > $@.tmp; \
        else \
                touch $@.tmp; \

diff --git a/THANKS b/THANKS
index e8e8cd2f3347fd235ee3a8b7ebc98a5a74108afd..a79b360790db72d77f4660a2ea36dfc17e3b9944 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -128,6 +128,7 @@ Mike Taylor
 Derek J Smithies
 jhansen
 Benoit Papillault
+Russell Harmon
 
 Apologies to anyone whose name was unintentionally left off.
 Please let us know if you think your name should be mentioned here!