Make "gnulib-tool --version" work in git-cvsserver checkout.

diff --git a/ChangeLog b/ChangeLog
index 1bbbd27fa30ebf3a39fb29a345b0c062e4b495dd..453a7f8a86da1711fe0271ca4ff6f11006e835eb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-17  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (func_version): Use $version.
+
 2007-09-16  Bruno Haible  <bruno@clisp.org>
 
        * m4/printf.m4 (gl_PRINTF_LONG_DOUBLE, gl_PRINTF_INFINITE,

diff --git a/gnulib-tool b/gnulib-tool
index f4f6ad3a310b6515ea12165a4849a770842a78a8..f6c4a1716391ea381af4dadba7bd92fe36d3885d 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,9 +22,11 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2007-09-16 00:41:34 $'
+cvsdatestamp='$Date: 2007-09-17 10:26:33 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
+# Sometimes last_checkin_date is "YYYY/MM/DD ...", sometimes "YYYY-MM-DD ...".
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
+# version is in YYYY-MM-DD format.
 nl='
 '
 IFS=" ""       $nl"
@@ -196,7 +198,7 @@ Report bugs to <bug-gnulib@gnu.org>."
 # outputs to stdout the --version message.
 func_version ()
 {
-  year=`echo "$last_checkin_date" | sed -e 's,/.*$,,'`
+  year=`echo "$version" | sed -e 's,-.*$,,'`
   echo "\
 $progname (GNU $package) $version
 Copyright (C) $year Free Software Foundation, Inc.