[gjs/wip/jtojnar/nixos-fixes: 1/3] build: Make installed tests vars absolute



commit 5cfd2c2ffd2d8c002d40f658e1c54027dc5d8506
Author: Jan Tojnar <jtojnar gmail com>
Date:   Sun Mar 15 01:41:58 2020 +0100

    build: Make installed tests vars absolute
    
    This is again a prevalent convention.
    Installation can handle absolute paths and it will be easier to use them in the generated files.

 installed-tests/js/meson.build | 2 +-
 installed-tests/meson.build    | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
index f0f6ccdd..42cb1b82 100644
--- a/installed-tests/js/meson.build
+++ b/installed-tests/js/meson.build
@@ -6,7 +6,7 @@ jsunit_resources_files = gnome.compile_resources('jsunit-resources',
 minijasmine = executable('minijasmine', '../minijasmine.cpp',
     jsunit_resources_files, dependencies: libgjs_dep,
     cpp_args: [
-        '-DINSTTESTDIR="@0@"'.format(get_option('prefix') / installed_tests_execdir),
+        '-DINSTTESTDIR="@0@"'.format(installed_tests_execdir),
         '-DPKGLIBDIR="@0@"'.format(get_option('prefix') / pkglibdir)
     ],
     include_directories: top_include,
diff --git a/installed-tests/meson.build b/installed-tests/meson.build
index 91476dca..47648955 100644
--- a/installed-tests/meson.build
+++ b/installed-tests/meson.build
@@ -1,8 +1,7 @@
 ### Installed tests ############################################################
 
-installed_tests_execdir = pkglibexecdir / 'installed-tests'
-installed_tests_metadir = (get_option('datadir') / 'installed-tests' /
-    meson.project_name())
+installed_tests_execdir = get_option('prefix') / pkglibexecdir / 'installed-tests'
+installed_tests_metadir = abs_datadir / 'installed-tests' / meson.project_name()
 
 # Simple shell script tests #
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]