From: Olivier Matz <olivier.matz@6wind.com>
Date: Tue, 5 May 2015 09:00:09 +0000 (+0200)
Subject: scripts: fix build in a symlinked directory
X-Git-Tag: spdx-start~9228
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=8c0eca54cd56bb670a028a4ada907ec9610e5d9c;p=dpdk.git

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 <olivier.matz@6wind.com>
Tested-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
---

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#*/}