From 909bdc06201691d819dd3d37d584005855652c1b Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 20 Sep 2005 11:48:17 +0000 Subject: [PATCH] Ignore trailing slashes in --m4-base value etc. --- ChangeLog | 6 ++++++ gnulib-tool | 20 ++++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c49d3eb5f8..df74ad0d1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-09-20 Bruno Haible + + * gnulib-tool: Remove trailing slashes from the values specified for + --source-base, --m4-base, --tests-base, --aux-dir. + Suggested by Simon Josefsson . + 2005-09-20 Bruno Haible * gnulib-tool (func_all_modules, func_modules_transitive_closure, diff --git a/gnulib-tool b/gnulib-tool index 21ea34253c..8cf563eb7a 100755 --- 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_ln_if_changed () func_version exit 0 ;; -- ) - # Stop option prcessing + # Stop option processing shift break ;; -* ) @@ -370,6 +370,22 @@ func_ln_if_changed () 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 -- 2.30.2