summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-19 17:09:01 +0000
committerEgbert Eich <eich@suse.de>2004-03-19 17:09:01 +0000
commit86aacb948300c7ea34b6e3982ad4a076fb865781 (patch)
tree458fcd608fa721359c2c2011f185989c5a64e54c
parent514a6cc61dc2d50f347883b1423191e6ad0e487d (diff)
13. fixed gtf + man pages (Xserver name and config file name configurableXORG-TM-CYGWIN-MERGEXORG-TM-CYGWIN-LAST-MERGEXORG-RELEASE-1-TM-CLOSEDXORG-RELEASE-1-TM
in Imake config files) (Egbert Eich). 12. Fixed xinit/startx man pages (server name and config file configurable) (Egbert Eich). 11. Fixed fontstosfnt (project and support address configurable) (Egbert Eich). 10. Fixed pswrap (relaced XFree86 with X11) (Egbert Eich). 9. fixed rman (added Xorg as system name) (Egbert Eich). 8. Fixed mkhtml (Egbert Eich). 7. Fixed default keyboard rules file in servers and setxkb (configurable) (Egbert Eich). 6. Fixed XawVendor (configurable) (Egbert Eich).
-rw-r--r--setxkbmap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/setxkbmap.c b/setxkbmap.c
index eb81cba..d89d110 100644
--- a/setxkbmap.c
+++ b/setxkbmap.c
@@ -1,3 +1,4 @@
+/* $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"