diff options
| author | Bruno Haible <bruno@clisp.org> | 2006-10-19 13:24:55 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2006-10-19 13:24:55 +0000 |
| commit | c50f1cfe92c23ef47773b47ccaba4b8c8e90c143 (patch) | |
| tree | fbb6d6d73ac6b7447be96f2b75ab4fdd1af4a4e0 | |
| parent | a107e556dc4fbe4023574f9026512bfef7e0e531 (diff) | |
| download | gnulib-c50f1cfe92c23ef47773b47ccaba4b8c8e90c143.tar.gz | |
Fix from Charles Wilson.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | gnulib-tool | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -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 713e6004a2..487fc2884c 100755 --- 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"` ;; |