CVS Build Failing

Aargh. I'm still having trouble getting CVS to build because of the 
new XFixes stuff. Here's my host.def

#define XnestServer		NO
#define XprtServer		NO
#define XF86CardDrivers		mga fbdev AgpGartDrivers vesa vga XF86OSCardDrivers 
#define XInputDrivers		mouse keyboard 
#define HaveMatroxHal		YES
#define BuildFonts              NO
#define BuildCyrillicFonts	NO
#define DefaultGcc2i386Opt	-O3 -mcpu=i686 -march=i686
#define UseInternalMalloc	YES
#define HasTk			YES
#define HasTcl			YES
#define XF1Bpp			NO
#define XF4Bpp			NO
#define BuildXinerama		NO
#define BuildLinuxDocHtml	NO
#define BuildSpecsDocs		YES
#define SpecsDocDirs		CTEXT GL ICCCM X11 Xext Xmu Xv XvMC i18n xterm
#define BuildAllSpecsDocs	YES
/*
 * Cope with CVS code ;-)
 */
#define BuildXFixesLibrary	NO

Here's the error I get:

make[4]: Leaving directory `/home/kwall/X/cvs/build/programs/Xserver/XTrap'
cleaning in programs/Xserver/xfixes...
make: Entering an unknown directory
make: *** xfixes: No such file or directory.  Stop.
make: Leaving an unknown directory
make[3]: *** [clean] Error 2
make[3]: Leaving directory `/home/kwall/X/cvs/build/programs/Xserver'
make[2]: *** [clean] Error 2
make[2]: Leaving directory `/home/kwall/X/cvs/build/programs'
make[1]: *** [clean] Error 2
make[1]: Leaving directory `/home/kwall/X/cvs/build'
make: *** [World] Error 2

I get this error even after removing build/xmakefile and re-executing
"make World". build is a shadow directory created using lndir. Could
someone kindly hit me with a clue bat? Thanks.

Kurt
-- 
Sometimes I worry about being a success in a mediocre world.
		-- Lily Tomlin