Index: programs/Xserver/hw/xfree86/xf86cfg/interface.c
===================================================================
RCS file: /cvs/fd/xorg/xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c,v
retrieving revision 1.2
diff -u -r1.2 interface.c
--- programs/Xserver/hw/xfree86/xf86cfg/interface.c	23 Apr 2004 19:54:18 -0000	1.2
+++ programs/Xserver/hw/xfree86/xf86cfg/interface.c	17 Oct 2004 09:30:03 -0000
@@ -300,7 +300,7 @@
     
     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 @@
 # 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
     }