aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-05-17 03:11:37 +0900
committerMike Blumenkrantz <zmike@samsung.com>2018-08-02 10:00:39 -0400
commit3cb88fe76aea2e73919d66344a24727a0d722ba0 (patch)
tree6dd85ca9b184ffe3aebf1776744c1111612ec2f7
parentinput method conf dialog - fix filtering of imc's to search path (diff)
downloadenlightenment-3cb88fe76aea2e73919d66344a24727a0d722ba0.tar.gz
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.
-rw-r--r--meson.build4
1 files changed, 4 insertions, 0 deletions
diff --git a/meson.build b/meson.build
index a2c134ad6..4ea695a9e 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')