From c229a714fc1fcef5d6189d6fae92b9899e8f0495 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 8 Oct 2009 18:11:56 -0700 Subject: Change default XKB rules file from "xorg" to "base" Signed-off-by: Alan Coopersmith --- Makefile.am | 1 - setxkbmap.c | 2 +- 2 files changed, 1 insertion(+), 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" -- cgit v1.2.3