Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/Imakefile,v
retrieving revision 1.2
diff -u -p -r1.2 Imakefile
--- Imakefile	23 Apr 2004 19:54:01 -0000	1.2
+++ Imakefile	19 Aug 2004 13:56:34 -0000
@@ -8,6 +8,12 @@ XCOMM $XFree86: xc/programs/Xserver/hw/x
 JOYSTICKDIR = joystick
 #endif
 
+#if UseDeprecatedKeyboardDriver
+BUILTIN=xf86KEYBOARD KBD
+#else
+BUILTIN=KBD
+#endif
+
 SUBDIRS = XInputDrivers $(JOYSTICKDIR)
 DRIVERS = XInputDrivers
 
@@ -35,7 +41,7 @@ INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC
 	   -I$(EXTINCSRC) -I$(XINCLUDESRC)
 
 #if !DoLoadableServer
-ConfigTargetNoDepend(drvConf,$(ICONFIGFILES),confdrv.SHsuf,$(DRIVERS))
+ConfigTargetNoDepend(drvConf,$(ICONFIGFILES),confdrv.SHsuf,$(BUILTIN) $(DRIVERS))
 DriverObjectList($(DRIVERS),idriver.list)
 #endif
 
Index: confdrv.sh
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/confdrv.sh,v
retrieving revision 1.2
diff -u -p -r1.2 confdrv.sh
--- confdrv.sh	23 Apr 2004 19:54:01 -0000	1.2
+++ confdrv.sh	19 Aug 2004 13:56:34 -0000
@@ -8,7 +8,6 @@
 #
 
 DRVCONF=./drvConf.c
-BUILTIN="xf86KEYBOARD"
 
 cat > $DRVCONF <<EOF
 /*
@@ -20,7 +19,7 @@ cat > $DRVCONF <<EOF
 
 extern InputDriverRec
 EOF
-Args="$BUILTIN `echo $* | tr '[a-z]' '[A-Z]'`"
+Args=`echo $* | tr '[a-z]' '[A-Z]'`
 set - $Args
 while [ $# -gt 1 ]; do
   echo "#undef $1" >> $DRVCONF