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

[Thierry Reding]

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>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.x.org/archives/xorg-devel/attachments/20180505/07e17187/attachment-0001.sig>