[xorg-commit-diffs] xc/programs/setxkbmap Imakefile, 1.1.4.2, 1.1.4.3 setxkbmap.c, 1.1.4.2, 1.1.4.3

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/setxkbmap
In directory pdx:/home/eich/tstbuild/xc/programs/setxkbmap

Modified Files:
      Tag: XORG-CURRENT
	Imakefile setxkbmap.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/setxkbmap/Imakefile,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Imakefile	5 Mar 2004 13:41:17 -0000	1.1.4.2
+++ b/Imakefile	15 Apr 2004 10:17:38 -0000	1.1.4.3
@@ -10,7 +10,7 @@
         DEPLIBS = $(DEPXKBFILELIB) $(DEPXONLYLIB)
 LOCAL_LIBRARIES = $(XKBFILELIB) $(XONLYLIB)
 
-        DEFINES = -DDFLT_XKB_CONFIG_ROOT=\"$(LIBDIR)/xkb\"
+        DEFINES = -DDFLT_XKB_CONFIG_ROOT=\"$(LIBDIR)/xkb\" $(XKBDEFRULESDEFS)
 
 INCLUDES = -I$(EXTINCSRC)
 

Index: setxkbmap.c
===================================================================
RCS file: /cvs/xorg/xc/programs/setxkbmap/setxkbmap.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/setxkbmap.c	5 Mar 2004 13:41:17 -0000	1.1.4.2
+++ b/setxkbmap.c	15 Apr 2004 10:17:38 -0000	1.1.4.3
@@ -1,3 +1,4 @@
+/* $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"