Fix from Charles Wilson.

diff --git a/ChangeLog b/ChangeLog
index d29128f95bdff77dae1b71fa70fc6af7ca32879f..9125540d154707657093034ad52c813008c9abef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-18  Charles Wilson  <cygwin@cwilson.fastmail.fm>
+
+       * gnulib-tool: Don't clobber $sourcebase when $local_gnulib_dir ends
+       in a slash.
+
 2006-10-18  Bruno Haible  <bruno@clisp.org>
 
        * lib/lock.h [C++]: Wrap definitions in extern "C".

diff --git a/gnulib-tool b/gnulib-tool
index 713e6004a22c4cfdcc5c085013fed4a36824a81e..487fc2884c2f1dd05625bf8b8441c1d35e5f1b7b 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2006-10-19 12:23:41 $'
+cvsdatestamp='$Date: 2006-10-19 13:24:55 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 nl='
@@ -678,7 +678,7 @@ func_relconcat ()
   # m4base (to avoid an error in func_import) and optional for the others.
   sed_trimtrailingslashes='s,\([^/]\)//*$,\1,'
   case "$local_gnulib_dir" in
-    */ ) sourcebase=`echo "$local_gnulib_dir" | sed -e "$sed_trimtrailingslashes"` ;;
+    */ ) local_gnulib_dir=`echo "$local_gnulib_dir" | sed -e "$sed_trimtrailingslashes"` ;;
   esac
   case "$sourcebase" in
     */ ) sourcebase=`echo "$sourcebase" | sed -e "$sed_trimtrailingslashes"` ;;