[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - Makefile.am

[László Németh]

 Makefile.am |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 74bc911efbf4882f389a49c8e627e7e8057d4a4b
Author: László Németh <laszlo.nemeth at collabora.com>
Date:   Mon Jan 30 15:54:10 2017 +0100

    add alternative Poco library search path for loolforkit and loolmount
    
    These executables are binaries with Linux capabilities, in which case
    LD_LIBRARY_PATH is ignored. As a workaround, we can use rpath to support
    the alternative Poco library path of a "classic" snap package.
    
    Change-Id: I23c1d58cce64875abb9629943bfffd7ea633b2bc
    Reviewed-on: https://gerrit.libreoffice.org/33705
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/Makefile.am b/Makefile.am
index 3ca5d0c..d9d6fed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,6 +29,8 @@ include_paths = -I${top_srcdir}/common -I${top_srcdir}/wsd -I${top_srcdir}/kit
 
 AM_CPPFLAGS = -pthread -DLOOLWSD_DATADIR='"@LOOLWSD_DATADIR@"' -DLOOLWSD_CONFIGDIR='"@LOOLWSD_CONFIGDIR@"' ${include_paths}
 AM_LDFLAGS = -pthread -Wl,-E
+loolforkit_LDFLAGS = -pthread -Wl,-E,-rpath,/snap/loolwsd/current/usr/lib
+loolmount_LDFLAGS = -pthread -Wl,-E,-rpath,/snap/loolwsd/current/usr/lib
 
 AM_ETAGSFLAGS = --c++-kinds=+p --fields=+iaS --extra=+q -R --totals=yes *
 AM_CTAGSFLAGS = $(AM_ETAGSFLAGS)