Mercurial > hg > octave-shane > gnulib-hg
changeset 7530:16228468de35
Fix from Charles Wilson.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Thu, 19 Oct 2006 13:24:55 +0000 |
| parents | cc0fde9eb167 |
| children | a382641e630e |
| files | ChangeLog gnulib-tool |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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".
--- 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 @@ # 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"` ;;