mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-01 18:44:07 +00:00
bdd0d54a08
https://gitlab.gnome.org/GNOME/json-glib/-/compare/1.6.6...1.8.0 NEWS look okay. xgettext is now optional. Changelog-reviewed-by: Bobby Rong <rjl931189261@126.com> Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
diff --git a/json-glib/tests/meson.build b/json-glib/tests/meson.build
|
|
index 1eb56c8..dca444e 100644
|
|
--- a/json-glib/tests/meson.build
|
|
+++ b/json-glib/tests/meson.build
|
|
@@ -21,8 +21,9 @@ test_data = [
|
|
'stream-load.json',
|
|
]
|
|
|
|
-installed_test_bindir = join_paths(json_libexecdir, 'installed-tests', json_api_name)
|
|
-installed_test_datadir = join_paths(json_datadir, 'installed-tests', json_api_name)
|
|
+installed_test_prefix = get_option('installed_test_prefix')
|
|
+installed_test_bindir = join_paths(installed_test_prefix, 'libexec', 'installed-tests', json_api_name)
|
|
+installed_test_datadir = join_paths(installed_test_prefix, 'share', 'installed-tests', json_api_name)
|
|
|
|
install_data(test_data, install_dir: installed_test_bindir)
|
|
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
|
index 5a96998..383aa6c 100644
|
|
--- a/meson_options.txt
|
|
+++ b/meson_options.txt
|
|
@@ -13,3 +13,6 @@ option('tests',
|
|
option('nls',
|
|
type: 'feature', value: 'auto', yield: true,
|
|
description: 'Enable native language support (translations)')
|
|
+option('installed_test_prefix',
|
|
+ description: 'Prefix for installed tests',
|
|
+ type: 'string')
|