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 <aplatt...@nvidia.com>
> ---
> include/meson.build | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)Reviewed-by: Thierry Reding <tred...@nvidia.com>
signature.asc
Description: PGP signature
_______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
