X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=buildtools%2Frelpath.sh;h=02953837a24094cc746c72608d54f8883e65cdcc;hb=ff37ca5d3773b7c82ad9b3d7e212e8ae7d39fc1a;hp=4ff4671e937bb44b43c5ef3c1cba782ead2f336e;hpb=4ec6960aec264172ac22f89c31ec4b43234bb264;p=dpdk.git diff --git a/buildtools/relpath.sh b/buildtools/relpath.sh index 4ff4671e93..02953837a2 100755 --- a/buildtools/relpath.sh +++ b/buildtools/relpath.sh @@ -1,35 +1,6 @@ #!/bin/sh - -# BSD LICENSE -# -# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Intel Corporation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2010-2014 Intel Corporation # # print the relative path of $1 from $2 directory @@ -44,7 +15,7 @@ if [ $# -ne 2 ]; then fi # get the real absolute path, derefencing symlinks -ABS1=$(readlink -f $1) +ABS1="$(dirname $(readlink -f $1))/$(basename $1)" ABS2=$(readlink -f $2) # remove leading slash