1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
|
Index: xorg/hw/xfree86/utils/xorgcfg/interface.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/interface.c,v
retrieving revision 1.8
diff -u -b -B -r1.8 interface.c
--- xorg/hw/xfree86/utils/xorgcfg/interface.c 8 Nov 2005 06:33:30 -0000 1.8
+++ xorg/hw/xfree86/utils/xorgcfg/interface.c 23 Mar 2006 07:42:49 -0000
@@ -65,7 +65,7 @@
#ifdef PROJECT_ROOT
#define DefaultXFree86Dir PROJECT_ROOT
#else
-#define DefaultXFree86Dir "/usr/X11R6"
+#define DefaultXFree86Dir "/usr"
#endif
#define IS_KBDDRIV(S) ((strcasecmp((S),"kbd") == 0) || \
Index: xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.c,v
retrieving revision 1.5
diff -u -b -B -r1.5 keyboard-cfg.c
--- xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.c 8 Nov 2005 06:33:30 -0000 1.5
+++ xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.c 23 Mar 2006 07:42:51 -0000
@@ -72,7 +72,7 @@
*/
static XF86XkbRulesDescInfo **xkb_desc, *xkb_rules;
static int num_xkb_desc;
-static char *XkbRulesDir = "lib/X11/xkb/rules/";
+static char *XkbRulesDir = "share/X11/xkb/rules/";
#ifdef XFREE98_XKB
static char *XkbRulesFile = "xfree98";
#else
Index: xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.h
===================================================================
RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.h,v
retrieving revision 1.3
diff -u -b -B -r1.3 keyboard-cfg.h
--- xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.h 4 Dec 2004 00:43:11 -0000 1.3
+++ xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.h 23 Mar 2006 07:42:51 -0000
@@ -38,7 +38,7 @@
/*
* All file names are from XProjectRoot or XWINHOME environment variable.
*/
-#define XkbConfigDir "lib/X11/xkb/"
+#define XkbConfigDir "share/X11/xkb/"
#define XkbConfigFile "X0-config.keyboard"
/*
Index: xorg/hw/xfree86/utils/xorgcfg/loader.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/loader.c,v
retrieving revision 1.5
diff -u -b -B -r1.5 loader.c
--- xorg/hw/xfree86/utils/xorgcfg/loader.c 8 Dec 2005 17:54:40 -0000 1.5
+++ xorg/hw/xfree86/utils/xorgcfg/loader.c 23 Mar 2006 07:42:51 -0000
@@ -55,7 +55,7 @@
#include <stdarg.h>
#ifndef OPTIONSPATH
-#define OPTIONSPATH "/usr/X11R6/lib/X11"
+#define OPTIONSPATH "/usr/lib/X11"
#endif
#ifndef SIGNALRETURNSINT
Index: xorg/hw/xfree86/utils/xorgcfg/text-mode.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/text-mode.c,v
retrieving revision 1.6
diff -u -b -B -r1.6 text-mode.c
--- xorg/hw/xfree86/utils/xorgcfg/text-mode.c 8 Dec 2005 17:54:40 -0000 1.6
+++ xorg/hw/xfree86/utils/xorgcfg/text-mode.c 23 Mar 2006 07:42:55 -0000
@@ -52,12 +52,12 @@
(strcmp((X), "keyboard") == 0))
#ifndef PROJECT_ROOT
-#define PROJECT_ROOT "/usr/X11R6"
+#define PROJECT_ROOT "/usr"
#endif
#ifndef XKB_RULES_DIR
#ifndef __UNIXOS2__
-#define XKB_RULES_DIR PROJECT_ROOT "/lib/X11/xkb/rules"
+#define XKB_RULES_DIR PROJECT_ROOT "/share/X11/xkb/rules"
#else
#define XKB_RULES_DIR XF86CONFIGDIR "/xkb/rules"
#endif
@@ -558,7 +558,7 @@
#elif defined(__UNIXOS2__)
str = "mouse$";
#else
- str = "/dev/mouse";
+ str = "/dev/input/mice";
#endif
ClearScreen();
|
GitWeb