pyrox.dev
1diff --git a/data/tests/meson.build b/data/tests/meson.build
2index 8b38f10..250582c 100644
3--- a/data/tests/meson.build
4+++ b/data/tests/meson.build
5@@ -17,6 +17,6 @@ if get_option('installed_tests')
6 'test.ccss',
7 'test.sp',
8 ],
9- install_dir: join_paths(libexecdir, 'installed-tests', 'colord')
10+ install_dir: join_paths('@installed_tests_dir@', 'libexec', 'installed-tests', 'colord')
11 )
12 endif
13diff --git a/lib/colord/cd-test-shared.c b/lib/colord/cd-test-shared.c
14index c3b9d23..7577e13 100644
15--- a/lib/colord/cd-test-shared.c
16+++ b/lib/colord/cd-test-shared.c
17@@ -45,7 +45,8 @@ cd_test_get_filename (const gchar *filename)
18
19 /* running in the installed system */
20 if (g_getenv ("INSTALLED_TESTS") != NULL) {
21- return g_build_filename (LIBEXECDIR,
22+ return g_build_filename ("@installed_tests_dir@",
23+ "libexec",
24 "installed-tests",
25 PACKAGE_NAME,
26 filename,
27diff --git a/lib/colord/meson.build b/lib/colord/meson.build
28index 61f0518..df71358 100644
29--- a/lib/colord/meson.build
30+++ b/lib/colord/meson.build
31@@ -214,20 +214,20 @@ endif
32 if get_option('installed_tests')
33 con2 = configuration_data()
34 con2.set('installedtestsdir',
35- join_paths(libexecdir, 'installed-tests', 'colord'))
36+ join_paths('@installed_tests_dir@', 'libexec', 'installed-tests', 'colord'))
37 configure_file(
38 input : 'colord-daemon.test.in',
39 output : 'colord-daemon.test',
40 configuration : con2,
41 install: true,
42- install_dir: join_paths('share', 'installed-tests', 'colord'),
43+ install_dir: join_paths('@installed_tests_dir@', 'share', 'installed-tests', 'colord'),
44 )
45 configure_file(
46 input : 'colord-private.test.in',
47 output : 'colord-private.test',
48 configuration : con2,
49 install: true,
50- install_dir: join_paths('share', 'installed-tests', 'colord'),
51+ install_dir: join_paths('@installed_tests_dir@', 'share', 'installed-tests', 'colord'),
52 )
53 endif
54
55@@ -254,7 +254,7 @@ if get_option('tests')
56 '-DTESTDATADIR="' + testdatadir + '"',
57 ],
58 install : get_option('installed_tests'),
59- install_dir : join_paths(libexecdir, 'installed-tests', 'colord'),
60+ install_dir : join_paths('@installed_tests_dir@','libexec', 'installed-tests', 'colord'),
61 )
62 test('colord-test-private', e)
63 e = executable(
64@@ -278,7 +278,7 @@ if get_option('tests')
65 '-DTESTDATADIR="' + testdatadir + '"',
66 ],
67 install : get_option('installed_tests'),
68- install_dir : join_paths(libexecdir, 'installed-tests', 'colord'),
69+ install_dir : join_paths('@installed_tests_dir@', 'libexec', 'installed-tests', 'colord'),
70 )
71 test('colord-test-daemon', e)
72 endif