[Mesa-dev] [PATCH] meson: correctly set SYSCONFDIR for loading dirrc

Dylan Baker dylan at pnwbakers.com
Tue Jan 23 18:28:08 UTC 2018


Fixes: d1992255bb29 ("meson: Add build Intel "anv" vulkan driver")
Reported-by: Marc Dietrich <marvin24 at gmx.de>
Signed-off-by: Dylan Baker <dylan.c.baker at intel.com>
---
 src/util/meson.build | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/util/meson.build b/src/util/meson.build
index fa591c92e56..b23dba3a985 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -112,8 +112,12 @@ libxmlconfig = static_library(
   files_xmlconfig,
   include_directories : inc_common,
   dependencies : [dep_expat, dep_m],
-  c_args : [c_msvc_compat_args, c_vis_args,
-            '-DSYSCONFDIR="@0@"'.format(get_option('sysconfdir'))],
+  c_args : [
+    c_msvc_compat_args, c_vis_args,
+    '-DSYSCONFDIR="@0@"'.format(
+      join_paths(get_option('prefix'), get_option('sysconfdir'))
+    ),
+  ],
   build_by_default : false,
 )
 
-- 
2.16.0



More information about the mesa-dev mailing list