46 lines
2.6 KiB
Diff
46 lines
2.6 KiB
Diff
diff --git a/data/installed-tests/meson.build b/data/installed-tests/meson.build
|
||
index be3d5c6d9..14d45dcaf 100644
|
||
--- a/data/installed-tests/meson.build
|
||
+++ b/data/installed-tests/meson.build
|
||
@@ -83,5 +83,5 @@ configure_file(
|
||
output: 'fwupd-tests.conf',
|
||
configuration: con2,
|
||
install: true,
|
||
- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
|
||
+ install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'),
|
||
)
|
||
diff --git a/meson.build b/meson.build
|
||
index 30011f548..7ac8c937a 100644
|
||
--- a/meson.build
|
||
+++ b/meson.build
|
||
@@ -186,8 +186,8 @@ else
|
||
datadir = join_paths(prefix, get_option('datadir'))
|
||
sysconfdir = join_paths(prefix, get_option('sysconfdir'))
|
||
localstatedir = join_paths(prefix, get_option('localstatedir'))
|
||
- installed_test_bindir = join_paths(libexecdir, 'installed-tests', meson.project_name())
|
||
- installed_test_datadir = join_paths(datadir, 'installed-tests', meson.project_name())
|
||
+ installed_test_bindir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name())
|
||
+ installed_test_datadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name())
|
||
daemon_dir = join_paths(libexecdir, 'fwupd')
|
||
endif
|
||
mandir = join_paths(prefix, get_option('mandir'))
|
||
@@ -498,6 +498,7 @@ gnome = import('gnome')
|
||
i18n = import('i18n')
|
||
|
||
conf.set_quoted('FWUPD_PREFIX', prefix)
|
||
+conf.set_quoted('FWUPD_INSTALLED_TEST_PREFIX', get_option('installed_test_prefix'))
|
||
conf.set_quoted('FWUPD_BINDIR', bindir)
|
||
conf.set_quoted('FWUPD_LIBDIR', libdir)
|
||
conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir)
|
||
diff --git a/meson_options.txt b/meson_options.txt
|
||
index 6fc7e8437..29832fd08 100644
|
||
--- a/meson_options.txt
|
||
+++ b/meson_options.txt
|
||
@@ -57,6 +57,7 @@ option('systemd', type : 'feature', description : 'systemd support', deprecated:
|
||
option('systemd_unit_user', type : 'string', description : 'User account to use for fwupd-refresh.service (empty for DynamicUser)')
|
||
option('systemd_root_prefix', type: 'string', value: '', description: 'Directory to base systemd’s installation directories on')
|
||
option('elogind', type : 'feature', description : 'elogind support', deprecated: {'true': 'enabled', 'false': 'disabled'})
|
||
+option('installed_test_prefix', type: 'string', description: 'Prefix for installed tests')
|
||
option('tests', type : 'boolean', value : true, description : 'enable tests')
|
||
option('soup_session_compat', type : 'boolean', value : true, description : 'enable SoupSession runtime compatibility support')
|
||
option('curl', type : 'feature', description : 'libcurl support', deprecated: {'true': 'enabled', 'false': 'disabled'})
|