summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorOlivier Matz <olivier.matz@6wind.com>2015-05-05 11:00:09 +0200
committerThomas Monjalon <thomas.monjalon@6wind.com>2015-05-12 14:13:42 +0200
commit8c0eca54cd56bb670a028a4ada907ec9610e5d9c (patch)
tree4c696c3f105ce21e10c45824223ab4b47e83aa55 /scripts
parent1e38a7c669235c98d822bcfd2068ecd91ff990c1 (diff)
downloaddpdk-8c0eca54cd56bb670a028a4ada907ec9610e5d9c.zip
dpdk-8c0eca54cd56bb670a028a4ada907ec9610e5d9c.tar.gz
dpdk-8c0eca54cd56bb670a028a4ada907ec9610e5d9c.tar.xz
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>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/relpath.sh9
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/relpath.sh b/scripts/relpath.sh
index 00030e5..7d2f48f 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#*/}