diff -X /home/bill/src/excludes-cvs -X /home/bill/src/excludes-buildtree -X /home/bill/src/excludes-autotools -x INSTALL -ruN xorg/xc/programs/Xserver/xkb/xkbInit.c xorg-pkgconfig/xc/programs/Xserver/xkb/xkbInit.c
--- xorg/xc/programs/Xserver/xkb/xkbInit.c	2005-09-14 02:43:11.000000000 +0100
+++ xorg-pkgconfig/xc/programs/Xserver/xkb/xkbInit.c	2005-09-14 02:40:33.000000000 +0100
@@ -101,7 +101,7 @@
 #define	XKB_BASE_DIRECTORY	"/usr/lib/X11/xkb"
 #endif
 #ifndef XKB_BIN_DIRECTORY
-#define	XKB_BIN_DIRECTORY	XKB_BASE_DIRECTORY
+#define	XKB_BIN_DIRECTORY	"/usr/bin"
 #endif
 #ifndef XKB_DFLT_RULES_FILE
 #define	XKB_DFLT_RULES_FILE	"rules"
diff -X /home/bill/src/excludes-cvs -X /home/bill/src/excludes-buildtree -X /home/bill/src/excludes-autotools -x INSTALL -ruN xorg/xserver/xorg/configure.ac xorg-pkgconfig/xserver/xorg/configure.ac
--- xorg/xserver/xorg/configure.ac	2005-09-14 02:14:22.000000000 +0100
+++ xorg-pkgconfig/xserver/xorg/configure.ac	2005-09-14 02:27:22.000000000 +0100
@@ -303,6 +303,9 @@
 AC_ARG_WITH(xkb-path,        [  --with-xkb-path=PATH ],
 				[ XKBPATH="$withval" ],
 				[ XKBPATH="${datadir}/X11/xkb" ])
+AC_ARG_WITH(xkb-bindir,        [  --with-xkb-bindir=PATH ],
+				[ XKBBINDIR="$withval" ],
+				[ XKBBINDIR="${bindir}" ])
 AC_ARG_WITH(rgb-path,        [  --with-rgb-path=PATH ],
 				[ RGBPATH="$withval" ],
 				[ RGBPATH="${datadir}/X11/rgb" ])
@@ -933,6 +936,7 @@
 dnl these only go in xkb-config.h (which is shared by the Xorg and Xnest servers)
 AC_DEFINE(__XKBDEFRULES__, "xorg", [Default XKB rules])
 AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data])
+AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKBBINDIR, [Location of xkbcomp])
 
 dnl and the rest of these are generic, so they're in config.h
 AC_DEFINE(XFree86XDGA, 1, [Build XDGA support])
diff -X /home/bill/src/excludes-cvs -X /home/bill/src/excludes-buildtree -X /home/bill/src/excludes-autotools -x INSTALL -ruN xorg/xserver/xorg/include/xkb-config.h.in xorg-pkgconfig/xserver/xorg/include/xkb-config.h.in
--- xorg/xserver/xorg/include/xkb-config.h.in	2005-09-13 23:13:38.000000000 +0100
+++ xorg-pkgconfig/xserver/xorg/include/xkb-config.h.in	2005-09-13 17:38:04.000000000 +0100
@@ -11,4 +11,7 @@
 /* Path to XKB definitions. */
 #undef XKB_BASE_DIRECTORY
 
+/* Path to XKB bin directory (for xkbcomp) */
+#undef XKB_BIN_DIRECTORY
+
 #endif /* _XKB_CONFIG_H_ */