xserver: Branch 'master'

[Adam Jackson]

 include/meson.build |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f5ded22e14e2e15390eff8e01ce32de496ae0e86
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Fri May 4 10:48:17 2018 -0700

    meson: Set XCONFIGFILE to 'xorg.conf' instead of '/etc/xorg.conf'
    
    The autoconf build hard-codes XCONFIGFILE to just 'xorg.conf':
    
     XF86CONFIGFILE="xorg.conf"
     AC_DEFINE_DIR(XCONFIGFILE, XF86CONFIGFILE, [Name of configuration file])
    
    Later, the X server passes that into DoSubstitution() which expands the path:
    
     DoSubstitution(template="/etc/X11/%X", ..., XConfigFile="xorg.conf")
    
    This returns "/etc/X11/xorg.conf".
    
    The Meson build, on the other hand, sets XCONFIGFILE to
    join_paths(get_option('sysconfdir'), 'xorg.conf'). If sysconfdir is /etc, this
    results in '/etc/xorg.conf', resulting in DoSubstitution returning
    '/etc/X11/etc/xorg.conf'.
    
    Fix this by just hard-coding XCONFIGFILE to 'xorg.conf'.
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
    Reviewed-by: Thierry Reding <treding at nvidia.com>

diff --git a/include/meson.build b/include/meson.build
index 50ea1c3ba..f76f557be 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -261,7 +261,7 @@ endif
 conf_data.set('SVR4', cc.compiles(defines_svr4))
 conf_data.set_quoted('XKB_DFLT_RULES', get_option('xkb_default_rules'))
 conf_data.set('XORGSERVER', build_xorg)
-conf_data.set_quoted('XCONFIGFILE', join_paths(get_option('sysconfdir'), 'xorg.conf'))
+conf_data.set_quoted('XCONFIGFILE', 'xorg.conf')
 conf_data.set_quoted('__XSERVERNAME__', 'Xorg')
 conf_data.set('WITH_VGAHW', build_vgahw)
 conf_data.set('CSRG_BASED', csrg_based)
@@ -308,7 +308,7 @@ xorg_data = configuration_data()
 xorg_data.set_quoted('XORG_BIN_DIRECTORY', get_option('bindir'))
 xorg_data.set('XORG_VERSION_CURRENT', release)
 xorg_data.set_quoted('XF86CONFIGFILE', 'xorg.conf')
-xorg_data.set_quoted('XCONFIGFILE', join_paths(get_option('sysconfdir'), 'xorg.conf'))
+xorg_data.set_quoted('XCONFIGFILE', 'xorg.conf')
 xorg_data.set_quoted('XCONFIGDIR', 'xorg.conf.d')
 xorg_data.set_quoted('DEFAULT_XDG_DATA_HOME', '.local/share')
 xorg_data.set_quoted('DEFAULT_XDG_DATA_HOME_LOGDIR', 'xorg')