[PATCH] xkb: Set sane build time XKB defaults

[Dan Nicholson]

Previously, DIX set the default XKB rules to "base, pc105, us" during
initialization. That has now been moved to the DDX in 9c5dd733, but only
covers Xorg. This makes the builtin XKB match the previous DIX defaults.
Also changes the fallback XKB path match the typical location, although
XKB_BASE_DIRECTORY is always set during configure.

Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>
---
 I think this is also needed for server-1.6-branch since this affects all
 the non-Xorg DDX there, too.

 xkb/xkbInit.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 5f51c45..3f07af5 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -86,7 +86,7 @@ typedef struct	_SrvXkmInfo {
 /***====================================================================***/
 
 #ifndef XKB_BASE_DIRECTORY
-#define	XKB_BASE_DIRECTORY	"/usr/lib/X11/xkb"
+#define	XKB_BASE_DIRECTORY	"/usr/share/X11/xkb"
 #endif
 #ifndef XKB_BIN_DIRECTORY
 #define	XKB_BIN_DIRECTORY	XKB_BASE_DIRECTORY
@@ -98,7 +98,7 @@ typedef struct	_SrvXkmInfo {
 #define	XKB_DFLT_KB_LAYOUT	"us"
 #endif
 #ifndef XKB_DFLT_KB_MODEL
-#define	XKB_DFLT_KB_MODEL	"dflt"
+#define	XKB_DFLT_KB_MODEL	"pc105"
 #endif
 #ifndef XKB_DFLT_KB_VARIANT
 #define	XKB_DFLT_KB_VARIANT	NULL
-- 
1.5.6.6