From 7a514a0070e871f8383c6839b90d2714ecc90e18 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Mon, 23 Jan 2017 12:11:28 +0000 Subject: [PATCH] buildtools: allow symlinks within a source directory When creating the symlinks for header files to the include folder, the relpath script dereferenced all symlinks. This made it impossible to have file A.h renamed to B.h and then symlinked back to its original name. This is useful to be able to do when refactoring or reworking a library. Change this so that we just use the dirname of the path from readlink, we can use the basename as it was originally, even if it was a symlink. Signed-off-by: Bruce Richardson --- buildtools/relpath.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildtools/relpath.sh b/buildtools/relpath.sh index 4ff4671e93..139b7813e9 100755 --- a/buildtools/relpath.sh +++ b/buildtools/relpath.sh @@ -44,7 +44,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 -- 2.20.1