Commit acb65649 authored by Sam Thursfield's avatar Sam Thursfield

Merge branch 'sam/build-fixes' into 'master'

Fix some broken-by-default aspects of the developer experience

See merge request GNOME/tracker-miners!80
parents 1d545b0e 1bace075
......@@ -62,7 +62,7 @@ endif
custom_target('tracker-miners-compile-schemas',
output: 'gschemas.compiled',
command: [find_program('glib-compile-schemas'), meson.current_build_dir()],
command: [glib_compile_schemas, meson.current_build_dir()],
build_by_default: true,
depends: compile_schemas_deps)
......
......@@ -386,6 +386,7 @@ configinc = include_directories('./')
srcinc = include_directories('src/')
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))
# NOTE: We don't use ${TRACKER_API_VERSION} because other content like
......@@ -399,6 +400,7 @@ tracker_uninstalled_writeback_modules_dir = join_paths(meson.current_build_dir()
gsettings_schema_dir = join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0', 'schemas')
glib_compile_schemas = find_program('glib-compile-schemas')
glib_mkenums = find_program('glib-mkenums')
subdir('src')
......@@ -417,6 +419,8 @@ subdir('tests')
subdir('po')
meson.add_install_script('meson_integration_commands.sh', glib_compile_schemas.path(), gsettings_schema_dir)
summary = [
'\nBuild Configuration:',
' Prefix: ' + get_option('prefix'),
......
#!/bin/sh
# Post install triggers.
#
# These are needed when following the developer workflow that we suggest in
# README.md, of installing into an isolated prefix like ~/opt/tracker.
set -e
GLIB_COMPILE_SCHEMAS=$1
GSETTINGS_SCHEMAS_DIR=$2
if [ -z "$DESTDIR" ]; then
$GLIB_COMPILE_SCHEMAS $GSETTINGS_SCHEMAS_DIR
fi
......@@ -31,7 +31,7 @@ executable('tracker-miner-fs', sources,
c_args: tracker_c_args,
install: true,
install_dir: get_option('libexecdir'),
install_rpath: tracker_internal_libs_dir,
install_rpath: tracker_install_rpath,
)
dbus_service_file_untranslated = configure_file(
......
......@@ -8,7 +8,7 @@ executable('tracker-miner-rss', sources,
c_args: tracker_c_args,
install: true,
install_dir: get_option('libexecdir'),
install_rpath: tracker_internal_libs_dir,
install_rpath: tracker_install_rpath,
)
dbus_service_file_untranslated = configure_file(
......
......@@ -167,7 +167,7 @@ executable('tracker-extract',
dependencies: tracker_extract_dependencies,
install: true,
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(
input: 'org.freedesktop.Tracker1.Miner.Extract.service.in.in',
......
......@@ -47,7 +47,7 @@ executable('tracker-writeback',
dependencies: [gmodule, tracker_miner, tracker_sparql, tracker_miners_common_dep],
install: true,
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(
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