70. Merging in the TM branch (Egbert Eich).

e733e17b · Egbert Eich · 514a6cc6 · e733e17b
Commit e733e17b authored Apr 02, 2004 by Egbert Eich
--- a/setxkbmap.c
+++ b/setxkbmap.c
+/* $XdotOrg: xc/programs/setxkbmap/setxkbmap.c,v 3.7 2003/01/20 04:15:08 dawes Exp $ */
 /************************************************************
 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"