--- lib/X11/Imakefile.orig	Tue May  1 19:35:05 2001
+++ lib/X11/Imakefile	Wed Jun  6 23:35:50 2001
@@ -905,7 +905,7 @@
 REQUIREDLIBS = -lcygipc
 #endif
 
-#if !BuildServersOnly || XnestServer || BuildGLXLibrary || BuildClients
+#if !BuildServersOnly || XnestServer || BuildGLXLibrary || BuildClients || FreeBSDBuildXxserv
 #include <Library.tmpl>
 
 SpecialCLibObjectRule(ErrDes,$(ICONFIGFILES),$(EDB_DEFINES))
@@ -944,8 +944,10 @@
 #if InstallXcmsTxt
 InstallNonExecFile(Xcms.txt,$(LIBDIR))
 #endif
+#if !defined(FreeBSDBuildXlib) || !FreeBSDBuildXlib
 InstallNonExecFile(XErrorDB,$(LIBDIR))
 InstallNonExecFile(XKeysymDB,$(LIBDIR))
+#endif
 InstallLintLibrary(X11,$(LINTLIBDIR))
 
 
