• Aaron Plattner's avatar
    meson: Set XCONFIGFILE to 'xorg.conf' instead of '/etc/xorg.conf' · f5ded22e
    Aaron Plattner authored
    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: 's avatarAaron Plattner <aplattner@nvidia.com>
    Reviewed-by: 's avatarThierry Reding <treding@nvidia.com>
    f5ded22e
Name
Last commit
Last update
..
.gitignore Loading commit data...
Makefile.am Loading commit data...
XIstubs.h Loading commit data...
Xprintf.h Loading commit data...
busfault.h Loading commit data...
callback.h Loading commit data...
client.h Loading commit data...
closestr.h Loading commit data...
closure.h Loading commit data...
colormap.h Loading commit data...
colormapst.h Loading commit data...
cursor.h Loading commit data...
cursorstr.h Loading commit data...
dbus-core.h Loading commit data...
displaymode.h Loading commit data...
dix-config-apple-verbatim.h Loading commit data...
dix-config.h.in Loading commit data...
dix.h Loading commit data...
dixaccess.h Loading commit data...
dixevents.h Loading commit data...
dixfont.h Loading commit data...
dixfontstr.h Loading commit data...
dixgrabs.h Loading commit data...
dixstruct.h Loading commit data...
eventconvert.h Loading commit data...
events.h Loading commit data...
eventstr.h Loading commit data...
exevents.h Loading commit data...
extension.h Loading commit data...
extinit.h Loading commit data...
extnsionst.h Loading commit data...
gc.h Loading commit data...
gcstruct.h Loading commit data...
globals.h Loading commit data...
glx_extinit.h Loading commit data...
glxvndabi.h Loading commit data...
hotplug.h Loading commit data...
input.h Loading commit data...
inputstr.h Loading commit data...
inpututils.h Loading commit data...
list.h Loading commit data...
meson.build Loading commit data...
misc.h Loading commit data...
miscstruct.h Loading commit data...
nonsdk_extinit.h Loading commit data...
opaque.h Loading commit data...
optionstr.h Loading commit data...
os.h Loading commit data...
pixmap.h Loading commit data...
pixmapstr.h Loading commit data...
privates.h Loading commit data...
probes.h Loading commit data...
property.h Loading commit data...
propertyst.h Loading commit data...
protocol-versions.h Loading commit data...
ptrveloc.h Loading commit data...
region.h Loading commit data...
regionstr.h Loading commit data...
registry.h Loading commit data...
resource.h Loading commit data...
rgb.h Loading commit data...
screenint.h Loading commit data...
scrnintstr.h Loading commit data...
selection.h Loading commit data...
servermd.h Loading commit data...
site.h Loading commit data...
swaprep.h Loading commit data...
swapreq.h Loading commit data...
systemd-logind.h Loading commit data...
validate.h Loading commit data...
version-config.h.in Loading commit data...
vidmodestr.h Loading commit data...
window.h Loading commit data...
windowstr.h Loading commit data...
xkb-config.h.in Loading commit data...
xkbfile.h Loading commit data...
xkbrules.h Loading commit data...
xkbsrv.h Loading commit data...
xkbstr.h Loading commit data...
xorg-config.h.in Loading commit data...
xorg-config.h.meson.in Loading commit data...
xorg-server.h.in Loading commit data...
xorg-server.h.meson.in Loading commit data...
xserver-properties.h Loading commit data...
xserver_poll.h Loading commit data...
xsha1.h Loading commit data...
xwayland-config.h.in Loading commit data...
xwayland-config.h.meson.in Loading commit data...
xwin-config.h.in Loading commit data...
xwin-config.h.meson.in Loading commit data...