From 8356277562a94bd0018b668439b23a1f0da8d71f Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 17 Apr 2018 16:29:41 +0200 Subject: [PATCH] Set rpath of the installed binaries. Let's set RPATH of installed binaries, this way, we will be able to run dynamically linked binaries without changing LD_LIBRARY_PATH. --- src/installer/meson.build | 3 ++- src/manager/meson.build | 3 ++- src/reader/meson.build | 3 ++- src/searcher/meson.build | 3 ++- src/server/meson.build | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/installer/meson.build b/src/installer/meson.build index 78daeda..73c4961 100644 --- a/src/installer/meson.build +++ b/src/installer/meson.build @@ -1,3 +1,4 @@ executable('kiwix-install', ['kiwix-install.cpp'], dependencies:all_deps, - install:true) + install:true, + install_rpath: join_paths(get_option('prefix'), get_option('libdir'))) diff --git a/src/manager/meson.build b/src/manager/meson.build index 78978c9..736e8fa 100644 --- a/src/manager/meson.build +++ b/src/manager/meson.build @@ -1,3 +1,4 @@ executable('kiwix-manage', ['kiwix-manage.cpp'], dependencies:all_deps, - install:true) + install:true, + install_rpath: join_paths(get_option('prefix'), get_option('libdir'))) diff --git a/src/reader/meson.build b/src/reader/meson.build index d8c0572..20bd65d 100644 --- a/src/reader/meson.build +++ b/src/reader/meson.build @@ -1,3 +1,4 @@ executable('kiwix-read', ['kiwix-read.cpp'], dependencies:all_deps, - install:true) + install:true, + install_rpath: join_paths(get_option('prefix'), get_option('libdir'))) diff --git a/src/searcher/meson.build b/src/searcher/meson.build index 922d51a..1e220db 100644 --- a/src/searcher/meson.build +++ b/src/searcher/meson.build @@ -1,3 +1,4 @@ executable('kiwix-search', ['kiwix-search.cpp'], dependencies:all_deps, - install:true) + install:true, + install_rpath: join_paths(get_option('prefix'), get_option('libdir'))) diff --git a/src/server/meson.build b/src/server/meson.build index f337656..5ce0465 100644 --- a/src/server/meson.build +++ b/src/server/meson.build @@ -4,4 +4,5 @@ sources += server_resources executable('kiwix-serve', sources, dependencies:all_deps, - install:true) + install:true, + install_rpath: join_paths(get_option('prefix'), get_option('libdir')))