summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2015-12-11 14:44:23 +0200
committerThomas Monjalon <thomas.monjalon@6wind.com>2015-12-12 00:34:57 +0100
commit08def3afcb135364d25c71de26ccf0876e1b90fd (patch)
tree7aca355492b13c0790ce0a02774cb6d09f88aabb
parentd0228ccbe227a65756c274c8a947b6965ece829b (diff)
downloaddpdk-08def3afcb135364d25c71de26ccf0876e1b90fd.zip
dpdk-08def3afcb135364d25c71de26ccf0876e1b90fd.tar.gz
dpdk-08def3afcb135364d25c71de26ccf0876e1b90fd.tar.xz
scripts: fix relpath.sh output when $prefix is set in environment
When relpath.sh is called from install target with prefix set, eg "make install DESTDIR=/tmp/dpdk-root prefix=/usr", the prefix from the environment leaks to relpath.sh internal helper variable and causes incorrect symlinks to be generated in sdk $(targetdir): include -> /usr../../../include/dpdk lib -> /usr../../../lib Initialize the local variable to empty to avoid side-effects from environment. Fixes: 6b62a72a70d0 ("mk: install a standard cutomizable tree") Signed-off-by: Panu Matilainen <pmatilai@redhat.com>
-rwxr-xr-xscripts/relpath.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/relpath.sh b/scripts/relpath.sh
index 7d2f48f..4ff4671 100755
--- a/scripts/relpath.sh
+++ b/scripts/relpath.sh
@@ -61,6 +61,8 @@ right2=${REL2#*/}
prev_right2=$REL2
prev_left2=
+prefix=
+
while [ "${right1}" != "" -a "${right2}" != "" ]; do
if [ "$left1" != "$left2" ]; then