X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=build-aux%2Fgit-version-gen;h=8317604f8fd5eb07d46a8a3c4e2a2ca24b5b442b;hb=b7be78fd0c455acefbdf32618c2f6488915c1a33;hp=7aa025365d1724c56029aaa680c9de78587af1ca;hpb=1a98f86fef7e1a212f453cfb09439f95f7606099;p=gnulib.git

diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index 7aa025365..8317604f8 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -1,13 +1,13 @@
 #!/bin/sh
 # Print a version string.
-scriptversion=2008-04-03.22
+scriptversion=2009-09-09.22
 
-# Copyright (C) 2007-2008 Free Software Foundation
+# Copyright (C) 2007-2009 Free Software Foundation
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +15,7 @@ scriptversion=2008-04-03.22
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/.
 # It may be run two ways:
@@ -95,7 +93,8 @@ if test -n "$v"
 then
     : # use $v
 elif test -d .git \
-    && v=`git describe --abbrev=4 HEAD 2>/dev/null` \
+    && v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \
+	  || git describe --abbrev=4 HEAD 2>/dev/null` \
     && case $v in
 	 v[0-9]*) ;;
 	 *) (exit 1) ;;