2020-11-12 09:05:59 +00:00
|
|
|
diff --git a/data/installed-tests/meson.build b/data/installed-tests/meson.build
|
2023-10-09 19:29:22 +00:00
|
|
|
index dfce86b1c..5e34c4fa6 100644
|
2020-04-24 23:36:52 +00:00
|
|
|
--- a/data/installed-tests/meson.build
|
|
|
|
|
+++ b/data/installed-tests/meson.build
|
2023-10-09 19:29:22 +00:00
|
|
|
@@ -86,5 +86,5 @@ configure_file(
|
2023-02-02 18:25:31 +00:00
|
|
|
output: 'fwupd-tests.conf',
|
|
|
|
|
configuration: con2,
|
2020-04-24 23:36:52 +00:00
|
|
|
install: true,
|
2024-02-29 20:09:43 +00:00
|
|
|
- install_dir: join_paths(datadir, 'fwupd', 'remotes.d'),
|
2020-04-24 23:36:52 +00:00
|
|
|
+ install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'),
|
|
|
|
|
)
|
2020-11-12 09:05:59 +00:00
|
|
|
diff --git a/meson.build b/meson.build
|
2023-10-09 19:29:22 +00:00
|
|
|
index ca6ccdf92..36b1b47b0 100644
|
2020-11-12 09:05:59 +00:00
|
|
|
--- a/meson.build
|
|
|
|
|
+++ b/meson.build
|
2023-10-09 19:29:22 +00:00
|
|
|
@@ -188,8 +188,8 @@ else
|
2020-11-12 09:05:59 +00:00
|
|
|
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())
|
2022-06-16 17:23:12 +00:00
|
|
|
daemon_dir = join_paths(libexecdir, 'fwupd')
|
2020-11-12 09:05:59 +00:00
|
|
|
endif
|
|
|
|
|
mandir = join_paths(prefix, get_option('mandir'))
|
2023-10-09 19:29:22 +00:00
|
|
|
@@ -497,6 +497,7 @@ gnome = import('gnome')
|
2022-03-10 19:12:11 +00:00
|
|
|
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)
|
2020-11-12 09:05:59 +00:00
|
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
2023-10-09 19:29:22 +00:00
|
|
|
index 877891126..bfc5d1afd 100644
|
2020-04-24 23:36:52 +00:00
|
|
|
--- a/meson_options.txt
|
|
|
|
|
+++ b/meson_options.txt
|
2023-10-09 19:29:22 +00:00
|
|
|
@@ -452,6 +452,10 @@ option('elogind',
|
|
|
|
|
'false': 'disabled',
|
|
|
|
|
},
|
|
|
|
|
)
|
|
|
|
|
+option('installed_test_prefix',
|
|
|
|
|
+ type: 'string',
|
|
|
|
|
+ description: 'Prefix for installed tests'
|
|
|
|
|
+)
|
|
|
|
|
option('tests',
|
|
|
|
|
type: 'boolean',
|
|
|
|
|
value: true,
|
