--- xc/programs/Imakefile.orig	2005-12-28 23:34:40.000000000 +0000
+++ xc/programs/Imakefile	2005-12-28 23:39:53.000000000 +0000
@@ -129,7 +129,11 @@
 #endif
 
 #if BuildServersOnly || !BuildClients
+# if BuildFonts && !UseInstalled
+SUBDIRS = $(XSSRCDIR) $(XKBCOMPDIR) mkfontdir $(MKFONTSCALEDIR) $(RGBSRCDIR) $(XINITSRCDIR) bdftopcf xauth
+# else
 SUBDIRS = $(XSSRCDIR) $(XKBCOMPDIR)
+# endif /* BuildFonts && !UseInstalled */
 #else
 SUBDIRS = \
 	appres bdftopcf bitmap \