mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-26 07:34:11 +00:00
26 lines
1.4 KiB
Diff
26 lines
1.4 KiB
Diff
|
diff --git a/meson.build b/meson.build
|
||
|
|
index 4d91677..aaaeb2b 100644
|
||
|
|
--- a/meson.build
|
||
|
|
+++ b/meson.build
|
||
|
|
@@ -12,8 +12,8 @@
|
||
|
|
libexecdir = join_paths(prefix, get_option('libexecdir'))
|
||
|
|
localedir = join_paths(prefix, get_option('localedir'))
|
||
|
|
|
||
|
|
-installed_tests_metadir = join_paths(datadir, 'installed-tests', meson.project_name())
|
||
|
|
-installed_tests_execdir = join_paths(libexecdir, 'installed-tests', meson.project_name())
|
||
|
|
+installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name())
|
||
|
|
+installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name())
|
||
|
|
|
||
|
|
cc = meson.get_compiler('c')
|
||
|
|
host_system = host_machine.system()
|
||
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
||
|
|
index 3a525dd..fc86302 100644
|
||
|
|
--- a/meson_options.txt
|
||
|
|
+++ b/meson_options.txt
|
||
|
|
@@ -3,4 +3,5 @@
|
||
|
|
option('libproxy', type: 'feature', value: 'auto', description: 'support for libproxy proxy configration')
|
||
|
|
option('gnome_proxy', type: 'feature', value: 'auto', description: 'support for GNOME desktop proxy configuration')
|
||
|
|
option('installed_tests', type: 'boolean', value: false, description: 'enable installed tests')
|
||
|
|
+option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests')
|
||
|
|
option('static_modules', type: 'boolean', value: false, description: 'build static modules')
|