Get the "dev" suffix right.

[rsync.git] / mkgitver

diff --git a/mkgitver b/mkgitver
index fe8a3d1591a80fcae89bd34b41f154497b7cac5c..0102b0894e5f550f6b1e295cc1d1fd6e63322f35 100755 (executable)
--- a/mkgitver
+++ b/mkgitver
@@ -6,9 +6,11 @@ if [ ! -f git-version.h ]; then
     touch git-version.h
 fi
 
-if [ -e "$srcdir/.git" ]; then
-    gitver=`git describe --abbrev=8 2>/dev/null | sed -n '/^v3\.[0-9][0-9]*\.[0-9][0-9]*\(-\|$\)/p'`
-    if [ -n "$gitver" ]; then
+if test -d "$srcdir/.git" || test -f "$srcdir/.git"; then
+    gitver=`git describe --abbrev=8 2>/dev/null`
+    # NOTE: I'm avoiding "|" in sed since I'm not sure if sed -r is portable and "\|" fails on some OSes.
+    verchk=`echo "$gitver-" | sed -n '/^v3\.[0-9][0-9]*\.[0-9][0-9]*\(pre[0-9]*\)*-/p'`
+    if [ -n "$verchk" ]; then
        echo "#define RSYNC_GITVER \"$gitver\"" >git-version.h.new
        if ! diff git-version.h.new git-version.h >/dev/null; then
            echo "Updating git-version.h"