[gjs/rburton/gjs-testdir] installed-tests: install binaries to correct directory



commit 0f780d434a6fd0a6c49f806c5fb39fae43a6927d
Author: Ross Burton <ross burton intel com>
Date:   Tue May 5 14:28:14 2020 +0100

    installed-tests: install binaries to correct directory
    
    The Installed Tests document (and other packages) but binaries into
    /usr/libexec/installed-tests/[package], but GJS uses
    /usr/libexec/gjs/installed-tests.
    
    Reverse the order of the paths so that GJS follows everyone else.
    
    Closes #318.

 installed-tests/meson.build | 2 +-
 meson.build                 | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/installed-tests/meson.build b/installed-tests/meson.build
index 7e842025..9210957f 100644
--- a/installed-tests/meson.build
+++ b/installed-tests/meson.build
@@ -1,6 +1,6 @@
 ### Installed tests ############################################################
 
-installed_tests_execdir = get_option('prefix') / pkglibexecdir / 'installed-tests'
+installed_tests_execdir = get_option('prefix') / get_option('libexecdir') / 'installed-tests' / 
meson.project_name()
 installed_tests_metadir = abs_datadir / 'installed-tests' / meson.project_name()
 
 # Simple shell script tests #
diff --git a/meson.build b/meson.build
index 22b2ee95..ee2a6c94 100644
--- a/meson.build
+++ b/meson.build
@@ -301,7 +301,6 @@ configure_file(output: 'config.h', configuration: header_conf)
 ### Check for environment ######################################################
 
 gjsjsdir = get_option('datadir') / api_name
-pkglibexecdir = get_option('libexecdir') / meson.project_name()
 abs_datadir = get_option('prefix') / get_option('datadir')
 pkglibdir = get_option('libdir') / meson.project_name()
 


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