On Tue, Dec 16, 2008 at 1:52 PM, Peter Hutterer
<[email protected]> wrote:
> On Tue, Dec 16, 2008 at 12:05:17PM -0800, Dan Nicholson wrote:
>
>> diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
>> index 3935f40..6d45d74 100644
>> --- a/xkb/xkbInit.c
>> +++ b/xkb/xkbInit.c
>> @@ -87,19 +87,19 @@ 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
>> #endif
>> #ifndef XKB_DFLT_RULES_FILE
>> -#define XKB_DFLT_RULES_FILE "rules"
>> +#define XKB_DFLT_RULES_FILE "base"
>> #endif
>> #ifndef XKB_DFLT_KB_LAYOUT
>> #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
>
> this hunk is already in, except the XKB_BASE_DIRECTORY bit. At least Fedora
> and Ubuntu now ship in /usr/share, is there anyone left that ships in
> /usr/lib? Can you prep a separate patch for this please?
Sure. It's actually totally superfluous because XKB_BASE_DIRECTORY is
set in configure. This just matches the default of ${datadir}/X11/xkb.
--
Dan
_______________________________________________
xorg mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/xorg
