Mercurial > hg > octave-lojdl > gnulib-hg
changeset 6264:eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Tue, 20 Sep 2005 11:48:17 +0000 |
| parents | 9750529a8cf5 |
| children | e728a303a8d8 |
| files | ChangeLog gnulib-tool |
| diffstat | 2 files changed, 24 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-09-20 Bruno Haible <bruno@clisp.org> + + * gnulib-tool: Remove trailing slashes from the values specified for + --source-base, --m4-base, --tests-base, --aux-dir. + Suggested by Simon Josefsson <jas@extundo.com>. + 2005-09-20 Bruno Haible <bruno@clisp.org> * gnulib-tool (func_all_modules, func_modules_transitive_closure,
--- a/gnulib-tool +++ b/gnulib-tool @@ -22,7 +22,7 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2005-09-20 11:00:51 $' +cvsdatestamp='$Date: 2005-09-20 11:48:17 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` @@ -359,7 +359,7 @@ func_version exit 0 ;; -- ) - # Stop option prcessing + # Stop option processing shift break ;; -* ) @@ -370,6 +370,22 @@ break ;; esac done + + # Remove trailing slashes from the directory names. This is necessary for + # m4base (to avoid an error in func_import) and optional for the others. + sed_trimtrailingslashes='s,\([^/]\)//*$,\1,' + case "$sourcebase" in + */ ) sourcebase=`echo "$sourcebase" | sed -e "$sed_trimtrailingslashes"` ;; + esac + case "$m4base" in + */ ) m4base=`echo "$m4base" | sed -e "$sed_trimtrailingslashes"` ;; + esac + case "$testsbase" in + */ ) testsbase=`echo "$testsbase" | sed -e "$sed_trimtrailingslashes"` ;; + esac + case "$auxdir" in + */ ) auxdir=`echo "$auxdir" | sed -e "$sed_trimtrailingslashes"` ;; + esac } case "$0" in