v2: - Also fix drirc install path
Fixes: d1992255bb29 ("meson: Add build Intel "anv" vulkan driver")
Reported-by: Marc Dietrich <marvi...@gmx.de>
Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com>
Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com> (v1)
---
src/util/meson.build | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/util/meson.build b/src/util/meson.build
index fa591c92e56..4d34d578a25 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -83,7 +83,9 @@ files_mesa_util = files(
'u_vector.h',
)
-install_data('drirc', install_dir : get_option('sysconfdir'))
+sysdir = join_paths(get_option('prefix'), get_option('sysconfdir'))
+
+install_data('drirc', install_dir : sysdir)
files_xmlconfig = files(
'xmlconfig.c',
@@ -112,8 +114,9 @@ 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(sysdir),
+ ],
build_by_default : false,
)
--
2.16.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
