Merged changes from RELEASE-1 branch

22ee6b57 · Egbert Eich · 7d78f0b7 · 22ee6b57
Commit 22ee6b57 authored Apr 15, 2004 by Egbert Eich
--- a/setxkbmap.c
+++ b/setxkbmap.c
+/* $XdotOrg$ */
 /************************************************************
 Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.

@@ -49,7 +50,7 @@
 #define	DFLT_XKB_CONFIG_ROOT "/usr/X11R6/lib/X11/xkb"
 #endif
 #ifndef DFLT_XKB_RULES_FILE
-#define	DFLT_XKB_RULES_FILE "xfree86"
+#define	DFLT_XKB_RULES_FILE __XKBDEFRULES__
 #endif
 #ifndef DFLT_XKB_LAYOUT
 #define	DFLT_XKB_LAYOUT "us"