From 9980357df166e81b5d67fe6de33f9fff7869e373 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Tue, 2 Jul 2019 11:58:04 +0100 Subject: [PATCH] wmake: use expandPath to expand $PWD to handle symlinks Resolves patch request https://bugs.openfoam.org/view.php?id=3301 --- wmake/wmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/wmake/wmake b/wmake/wmake index 4836880eee..57f79af7f1 100755 --- a/wmake/wmake +++ b/wmake/wmake @@ -3,7 +3,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | Website: https://openfoam.org -# \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------ # License @@ -395,10 +395,11 @@ fi #------------------------------------------------------------------------------ objectsDir=$MakeDir/$WM_OPTIONS -if [[ "$PWD" = *"$WM_PROJECT_DIR"* ]] +expandPath "$PWD" +if [[ "$exPath" = *"$WM_PROJECT_DIR"* ]] then platformPath=$WM_PROJECT_DIR/platforms/${WM_OPTIONS} - objectsDir=$platformPath${PWD//$WM_PROJECT_DIR/} + objectsDir=$platformPath${exPath//$WM_PROJECT_DIR/} fi (