Mesa (master): meson: correctly set SYSCONFDIR for loading dirrc

[Dylan Baker]

Module: Mesa
Branch: master
Commit: 5781c3d1db4a01e77f416c1685025c4d830ae87d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5781c3d1db4a01e77f416c1685025c4d830ae87d

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Tue Jan 23 10:28:08 2018 -0800

meson: correctly set SYSCONFDIR for loading dirrc

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>
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.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 fa591c92e5..b23dba3a98 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,
 )