From 0e50dd0071be89825810dbf4c2310663dcb77767 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 1 May 2013 13:39:22 +0900 Subject: [PATCH] gnulib-tool: don't assume ln -s works * gnulib-tool (func_ln_s): New function. (func_ln): Use it. --- ChangeLog | 7 +++++++ gnulib-tool | 30 ++++++++++++++++++++++++++---- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5bedafaf0b..80d496e38c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2016-01-15 Paul Eggert + KO Myung-Hun + + gnulib-tool: don't assume ln -s works + * gnulib-tool (func_ln_s): New function. + (func_ln): Use it. + 2016-01-15 KO Myung-Hun utimes: detect utimes() correctly on OS/2 kLIBC diff --git a/gnulib-tool b/gnulib-tool index 34676f92c6..af1dcc4891 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -767,23 +767,45 @@ func_relconcat () done } +# func_ln_s SRC DEST +# Like ln -s, except use cp -p if ln -s fails. +func_ln_s () +{ + ln -s "$1" "$2" || { + echo "$progname: ln -s failed; falling back on cp -p" >>/tmp/log + echo "$progname: ln -s failed; falling back on cp -p" >&2 + symbolic= + lsymbolic= + do_copyrights=true + + case "$1" in + /* | ?:*) # SRC is absolute. + cp_src=$1 ;; + *) # SRC is relative to the directory of DEST. + cp_src=${2%/*}/$1 ;; + esac + + cp -p "$cp_src" "$2" + } +} + # func_ln SRC DEST -# Like ln -s, except that SRC is given relative to the current directory (or +# Like func_ln_s, except that SRC is given relative to the current directory (or # absolute), not given relative to the directory of DEST. func_ln () { case "$1" in /* | ?:*) - ln -s "$1" "$2" ;; + func_ln_s "$1" "$2" ;; *) # SRC is relative. case "$2" in /* | ?:*) - ln -s "`pwd`/$1" "$2" ;; + func_ln_s "`pwd`/$1" "$2" ;; *) # DEST is relative too. ln_destdir=`echo "$2" | sed -e 's,[^/]*$,,'` test -n "$ln_destdir" || ln_destdir="." func_relativize "$ln_destdir" "$1" - ln -s "$reldir" "$2" + func_ln_s "$reldir" "$2" ;; esac ;; -- 2.39.5