xserver: Branch 'master'

[Adam Jackson]

 include/meson.build |    2 +-
 meson.build         |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 73a0562615aa1adfb934b953e23b1e69b126db4f
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Mar 27 12:06:38 2018 -0400

    suid touchup

diff --git a/include/meson.build b/include/meson.build
index 69aea8095..787802bca 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -86,7 +86,7 @@ conf_data.set('GBM_BO_WITH_MODIFIERS',
 conf_data.set_quoted('SERVER_MISC_CONFIG_PATH', serverconfigdir)
 conf_data.set_quoted('PROJECTROOT', get_option('prefix'))
 conf_data.set_quoted('SYSCONFDIR', join_paths(get_option('prefix'), get_option('sysconfdir')))
-conf_data.set_quoted('SUID_WRAPPER_DIR', join_paths(get_option('prefix'), get_option('libexecdir')))
+conf_data.set_quoted('SUID_WRAPPER_DIR', suid_wrapper_dir)
 
 # XXX: Stopped enumerating at COMPILEDEFAULTFONTPATH
 conf_data.set('XORG_VERSION_CURRENT', release)
diff --git a/meson.build b/meson.build
index 47b87b5e6..2fe985cc0 100644
--- a/meson.build
+++ b/meson.build
@@ -492,7 +492,8 @@ manpage_config.set('bundle_id_prefix', '...')
 manpage_config.set('modulepath', join_paths(get_option('prefix'), module_dir))
 # wtf doesn't this work
 # manpage_config.set('suid_wrapper_dir', join_paths(get_option('prefix'), libexecdir))
-manpage_config.set('suid_wrapper_dir', join_paths(get_option('prefix'), 'libexec'))
+suid_wrapper_dir = join_paths(get_option('prefix'), 'libexec')
+manpage_config.set('suid_wrapper_dir', suid_wrapper_dir)
 manpage_config.set('default_font_path', 'catalogue:/etc/X11/fontpath.d:built-ins')
 
 # Include must come first, as it sets up dix-config.h