From f20762a82d1ade3dac10ef175f78c2777b97260e Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Thu, 17 May 2018 03:11:37 +0900 Subject: meson - fix dir_sysconf to be under the prefix as it was not dir_sysconf was set to "etc". not even a /. this meant enlightenment_sys couldnt find/load sysactions.conf as it used a non-relocatable fixed location due to security (setuid root) reasons. --- meson.build | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 62714857c6..9fc72e4214 100644 --- a/meson.build +++ b/meson.build @@ -47,6 +47,10 @@ dir_module_e = join_paths(dir_lib, proj, 'modules') dir_util_e = join_paths(dir_lib, proj, 'utils') dir_pc = join_paths(dir_data, 'pkgconfig') +if dir_sysconf == 'etc' + dir_sysconf = join_paths(dir_prefix, dir_sysconf) +endif + suid_exes = [] pkgconfig = import('pkgconfig') -- cgit v1.2.1