From 0b94f15d799932eec955cef0fbecf06dae06d923 Mon Sep 17 00:00:00 2001 From: Roland Mainz Date: Wed, 15 Dec 2004 03:10:20 +0000 Subject: //bugs.freedesktop.org/show_bug.cgi?id=1826) attachment #1283 (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 --- hw/xfree86/utils/xorgcfg/interface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'hw') diff --git a/hw/xfree86/utils/xorgcfg/interface.c b/hw/xfree86/utils/xorgcfg/interface.c index 2595fd376..c05ea2605 100644 --- a/hw/xfree86/utils/xorgcfg/interface.c +++ b/hw/xfree86/utils/xorgcfg/interface.c @@ -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 } -- cgit v1.2.3