fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-05 07:38:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

//bugs.freedesktop.org/show_bug.cgi?id=1826) attachment #1283

Browse source 
(https://bugs.freedesktop.org/attachment.cgi?id=1283): Do not add '-4'
    to generated default file name (e.g. "xorg.conf" instead of
    "xorg.conf-4"). Patch by Matthieu Herrb <matthieu.herrb@laas.fr>
This commit is contained in:
Roland Mainz 2004-12-15 03:10:20 +00:00
parent 87a3b1931c
commit 0b94f15d79
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hw/xfree86/utils/xorgcfg/interface.c
View file

@ -300,7 +300,7 @@ main(int argc, char *argv[])
startedx = startx();
if (XF86Config_path == NULL)
XF86Config_path = XtNewString(__XCONFIGFILE__"-4");
XF86Config_path = XtNewString(__XCONFIGFILE__);
if (XkbConfig_path == NULL) {
XmuSnprintf(XkbConfig_path_static, sizeof(XkbConfig_path_static),
"%s/%s%s", XFree86Dir, XkbConfigDir, XkbConfigFile);
@ -536,9 +536,9 @@ main(int argc, char *argv[])
# endif
#else
# ifdef XF86CONFIGDIR
XF86Config_path = XtNewString(XF86CONFIGDIR "/"__XCONFIGFILE__"-4");
XF86Config_path = XtNewString(XF86CONFIGDIR "/"__XCONFIGFILE__);
# else
XF86Config_path = XtNewString("/etc/X11/"__XCONFIGFILE__"-4");
XF86Config_path = XtNewString("/etc/X11/"__XCONFIGFILE__);
# endif
#endif
}