[PATCH xserver] meson: Set XCONFIGFILE to 'xorg.conf' instead of '/etc/xorg.conf'

[Adam Jackson]

On Sat, 2018-05-05 at 00:48 +0200, Thierry Reding wrote:
> On Fri, May 04, 2018 at 10:48:17AM -0700, Aaron Plattner wrote:
> > 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>
> > ---
> >  include/meson.build | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> Reviewed-by: Thierry Reding <treding at nvidia.com>

Merged, thanks:

remote: I: patch #220676 updated using rev f5ded22e14e2e15390eff8e01ce32de496ae0e86.
remote: I: 1 patch(es) updated to state Accepted.
To ssh://git.freedesktop.org/git/xorg/xserver
   1a3e4a2f67..f5ded22e14  master -> master

- ajax