From 8c0eca54cd56bb670a028a4ada907ec9610e5d9c Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Tue, 5 May 2015 11:00:09 +0200 Subject: [PATCH] scripts: fix build in a symlinked directory The script relpath.sh returns the relative path of the first directory from the second directory. It is used to generate relative symlinks, which can be useful if the build directory is embedded in the dpdk directory: the whole dpdk can be moved without breaking the links, which is helpful for an installation. In case the build directory is a symlink, the script was not generating the proper relative path. Fix this by calling "readlink -f" on the arguments. Signed-off-by: Olivier Matz Tested-by: Simon Kagstrom --- scripts/relpath.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/relpath.sh b/scripts/relpath.sh index 00030e5f59..7d2f48f9bb 100755 --- a/scripts/relpath.sh +++ b/scripts/relpath.sh @@ -43,8 +43,13 @@ if [ $# -ne 2 ]; then exit 1 fi -REL1=${1#/} -REL2=${2#/} +# get the real absolute path, derefencing symlinks +ABS1=$(readlink -f $1) +ABS2=$(readlink -f $2) + +# remove leading slash +REL1=${ABS1#/} +REL2=${ABS2#/} left1=${REL1%%/*} right1=${REL1#*/} -- 2.20.1