From: KO Myung-Hun Date: Tue, 2 Dec 2014 03:50:49 +0000 (+0900) Subject: gnulib-tool: recognize x:* as an absolute path X-Git-Tag: v1.0~7246 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=9a98fdfef2dfcaf855b5bcba873ada3798a2e89c;p=gnulib.git gnulib-tool: recognize x:* as an absolute path On OS/2, x:* is an absolute path, too. * gnulib-tool (func_gnulib_dir): Add ?:* case. (func_relconcat): Likewise. Signed-off-by: Eric Blake --- diff --git a/ChangeLog b/ChangeLog index d7911afb4f..2398d79d23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-12-02 KO Myung-Hun + + gnulib-tool: recognize x:* as an absolute path + * gnulib-tool (func_gnulib_dir): Add ?:* case. + (func_relconcat): Likewise. + 2014-12-02 Andrei Borzenkov argp: avoid extraneous translation and mem leak with empty pre doc diff --git a/gnulib-tool b/gnulib-tool index 1cab1ed145..2641378037 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -386,7 +386,7 @@ func_exit () func_gnulib_dir () { case "$progname" in - /*) self_abspathname="$progname" ;; + /* | ?:*) self_abspathname="$progname" ;; */*) self_abspathname=`pwd`/"$progname" ;; *) # Look in $PATH. @@ -449,7 +449,7 @@ func_gnulib_dir () linkval=`func_readlink "$self_abspathname"` test -n "$linkval" || break case "$linkval" in - /* ) self_abspathname="$linkval" ;; + /* | ?:* ) self_abspathname="$linkval" ;; * ) self_abspathname=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`/"$linkval" ;; esac done @@ -697,11 +697,11 @@ func_relconcat () func_ln () { case "$1" in - /*) + /* | ?:*) ln -s "$1" "$2" ;; *) # SRC is relative. case "$2" in - /*) + /* | ?:*) ln -s "`pwd`/$1" "$2" ;; *) # DEST is relative too. ln_destdir=`echo "$2" | sed -e 's,[^/]*$,,'`