diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-08 18:11:56 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-08 18:11:56 -0700 |
| commit | c229a714fc1fcef5d6189d6fae92b9899e8f0495 (patch) | |
| tree | f68dbda465550dab082777f8510215fd9ebe3ac7 | |
| parent | 08fa8d42ec875802bbe34291b087abdc559f183e (diff) | |
Change default XKB rules file from "xorg" to "base"
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | setxkbmap.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 4a7bb2f..fa42945 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,6 @@ bin_PROGRAMS = setxkbmap XKBCONFIGROOT=@XKBCONFIGROOT@ AM_CFLAGS = $(CWARNFLAGS) $(SETXKBMAP_CFLAGS) \ - -D__XKBDEFRULES__='"xorg"' \ -DDFLT_XKB_CONFIG_ROOT=\"$(XKBCONFIGROOT)\" setxkbmap_LDADD = $(SETXKBMAP_LIBS) diff --git a/setxkbmap.c b/setxkbmap.c index 32e55b2..338b06c 100644 --- a/setxkbmap.c +++ b/setxkbmap.c @@ -48,7 +48,7 @@ #define DFLT_XKB_CONFIG_ROOT "/usr/share/X11/xkb" #endif #ifndef DFLT_XKB_RULES_FILE -#define DFLT_XKB_RULES_FILE __XKBDEFRULES__ +#define DFLT_XKB_RULES_FILE "base" #endif #ifndef DFLT_XKB_LAYOUT #define DFLT_XKB_LAYOUT "us" |