Commit 6a9199a8 authored by Sam Thursfield's avatar Sam Thursfield

build: Include libdir in rpath

This fixes the case where Tracker is installed into a non-standard
prefix such as /opt/tracker and then fails to start with an error
such as this:

        /opt/tracker/bin/tracker: error while loading shared libraries: libtracker-control-2.0.so.0: cannot open shared object file: No such file or directory
parent b3f5cdfb
...@@ -386,6 +386,7 @@ configinc = include_directories('./') ...@@ -386,6 +386,7 @@ configinc = include_directories('./')
srcinc = include_directories('src/') srcinc = include_directories('src/')
tracker_internal_libs_dir = join_paths(get_option('prefix'), get_option('libdir'), 'tracker-miners-' + tracker_api_version) tracker_internal_libs_dir = join_paths(get_option('prefix'), get_option('libdir'), 'tracker-miners-' + tracker_api_version)
tracker_install_rpath = ':'.join([tracker_internal_libs_dir, libdir])
tracker_extract_modules_dir = join_paths(get_option('prefix'), get_option('libdir'), 'tracker-miners-@0@/extract-modules'.format(tracker_api_version)) tracker_extract_modules_dir = join_paths(get_option('prefix'), get_option('libdir'), 'tracker-miners-@0@/extract-modules'.format(tracker_api_version))
# NOTE: We don't use ${TRACKER_API_VERSION} because other content like # NOTE: We don't use ${TRACKER_API_VERSION} because other content like
......
...@@ -31,7 +31,7 @@ executable('tracker-miner-fs', sources, ...@@ -31,7 +31,7 @@ executable('tracker-miner-fs', sources,
c_args: tracker_c_args, c_args: tracker_c_args,
install: true, install: true,
install_dir: get_option('libexecdir'), install_dir: get_option('libexecdir'),
install_rpath: tracker_internal_libs_dir, install_rpath: tracker_install_rpath,
) )
dbus_service_file_untranslated = configure_file( dbus_service_file_untranslated = configure_file(
......
...@@ -8,7 +8,7 @@ executable('tracker-miner-rss', sources, ...@@ -8,7 +8,7 @@ executable('tracker-miner-rss', sources,
c_args: tracker_c_args, c_args: tracker_c_args,
install: true, install: true,
install_dir: get_option('libexecdir'), install_dir: get_option('libexecdir'),
install_rpath: tracker_internal_libs_dir, install_rpath: tracker_install_rpath,
) )
dbus_service_file_untranslated = configure_file( dbus_service_file_untranslated = configure_file(
......
...@@ -167,7 +167,7 @@ executable('tracker-extract', ...@@ -167,7 +167,7 @@ executable('tracker-extract',
dependencies: tracker_extract_dependencies, dependencies: tracker_extract_dependencies,
install: true, install: true,
install_dir: join_paths(get_option('prefix'), get_option('libexecdir')), install_dir: join_paths(get_option('prefix'), get_option('libexecdir')),
install_rpath: tracker_internal_libs_dir) install_rpath: tracker_install_rpath)
dbus_service_file_untranslated = configure_file( dbus_service_file_untranslated = configure_file(
input: 'org.freedesktop.Tracker1.Miner.Extract.service.in.in', input: 'org.freedesktop.Tracker1.Miner.Extract.service.in.in',
......
...@@ -47,7 +47,7 @@ executable('tracker-writeback', ...@@ -47,7 +47,7 @@ executable('tracker-writeback',
dependencies: [gmodule, tracker_miner, tracker_sparql, tracker_miners_common_dep], dependencies: [gmodule, tracker_miner, tracker_sparql, tracker_miners_common_dep],
install: true, install: true,
install_dir: join_paths(get_option('prefix'), get_option('libexecdir')), install_dir: join_paths(get_option('prefix'), get_option('libexecdir')),
install_rpath: tracker_internal_libs_dir) install_rpath: tracker_install_rpath)
dbus_service_file = configure_file( dbus_service_file = configure_file(
input: 'org.freedesktop.Tracker1.Writeback.service.in', input: 'org.freedesktop.Tracker1.Writeback.service.in',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment