diff --git a/win-linux/package/linux/common/usr/bin/desktopeditors.m4 b/win-linux/package/linux/common/usr/bin/desktopeditors.m4 index 6e1fa86ae..217a99407 100644 --- a/win-linux/package/linux/common/usr/bin/desktopeditors.m4 +++ b/win-linux/package/linux/common/usr/bin/desktopeditors.m4 @@ -110,9 +110,12 @@ check_templates() { check_templates "$@" DIR=/opt/M4_DESKTOPEDITORS_PREFIX +if [ ! -z "$LD_LIBRARY_PATH" ]; then + LDLPATH=:$LD_LIBRARY_PATH +fi ifelse(M4_COMPANY_NAME, ONLYOFFICE, -export LD_LIBRARY_PATH=$DIR:$LD_LIBRARY_PATH, +export LD_LIBRARY_PATH=$DIR$LDLPATH, DIR_MV=/opt/M4_MEDIAVIEWER_PREFIX -export LD_LIBRARY_PATH=$DIR:$DIR/converter:$DIR_MV:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=$DIR:$DIR/converter:$DIR_MV$LDLPATH export VLC_PLUGIN_PATH=$DIR_MV/plugins) exec $DIR/DesktopEditors "$@" diff --git a/win-linux/package/linux/common/usr/bin/imageviewer.m4 b/win-linux/package/linux/common/usr/bin/imageviewer.m4 index df524ca97..66ce7b6dd 100755 --- a/win-linux/package/linux/common/usr/bin/imageviewer.m4 +++ b/win-linux/package/linux/common/usr/bin/imageviewer.m4 @@ -1,5 +1,8 @@ #!/bin/sh DIR=/opt/M4_MEDIAVIEWER_PREFIX -export LD_LIBRARY_PATH=$DIR:$LD_LIBRARY_PATH +if [ ! -z "$LD_LIBRARY_PATH" ]; then + LDLPATH=:$LD_LIBRARY_PATH +fi +export LD_LIBRARY_PATH=$DIR$LDLPATH exec $DIR/ImageViewer "$@" diff --git a/win-linux/package/linux/common/usr/bin/videoplayer.m4 b/win-linux/package/linux/common/usr/bin/videoplayer.m4 index 4f46b0164..57f35764e 100755 --- a/win-linux/package/linux/common/usr/bin/videoplayer.m4 +++ b/win-linux/package/linux/common/usr/bin/videoplayer.m4 @@ -1,5 +1,8 @@ #!/bin/sh DIR=/opt/M4_MEDIAVIEWER_PREFIX -export LD_LIBRARY_PATH=$DIR:$LD_LIBRARY_PATH +if [ ! -z "$LD_LIBRARY_PATH" ]; then + LDLPATH=:$LD_LIBRARY_PATH +fi +export LD_LIBRARY_PATH=$DIR$LDLPATH exec $DIR/VideoPlayer "$@"