projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d2414e6
)
meson: correctly set SYSCONFDIR for loading dirrc
author
Dylan Baker
<dylan@pnwbakers.com>
Tue, 23 Jan 2018 18:28:08 +0000
(10:28 -0800)
committer
Dylan Baker
<dylan@pnwbakers.com>
Wed, 24 Jan 2018 21:10:32 +0000
(13:10 -0800)
Fixes: d1992255bb29 ("meson: Add build Intel "anv" vulkan driver")
Reported-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Dylan Baker <dylan.c.baker@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
src/util/meson.build
patch
|
blob
|
history
diff --git
a/src/util/meson.build
b/src/util/meson.build
index fa591c92e5624c5e63f49f3bcb96c803ce899394..b23dba3a9851154b5edc499d024bc3dc505167f3 100644
(file)
--- 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,
)