From e4fbeb5bb8616f59e43164fdd1de356e6e055da8 Mon Sep 17 00:00:00 2001 From: AlexPeshkoff Date: Thu, 20 May 2021 15:53:48 +0300 Subject: [PATCH] New method to define default lib directory --- .../arch-specific/linux/linuxLibrary.sh.in | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/builds/install/arch-specific/linux/linuxLibrary.sh.in b/builds/install/arch-specific/linux/linuxLibrary.sh.in index 1493d0d155..f7d749ccbd 100644 --- a/builds/install/arch-specific/linux/linuxLibrary.sh.in +++ b/builds/install/arch-specific/linux/linuxLibrary.sh.in @@ -475,24 +475,10 @@ standaloneServerInstalled() { #------------------------------------------------------------------------ # Corrects build-time "libdir" value +# Warning - parameter ignored !!! CorrectLibDir() { - ld=${1} - l=/usr/lib - l64=/usr/lib64 - - if [ "$ld" = "$l64" ] - then - if [ -d "$l" ] - then - if [ ! -d "$l64" ] - then - ld="$l" - fi - fi - fi - - echo "$ld" + dirname $(ldconfig -p | grep ld-linux | awk -F '>' '{print $2;}') }