--- lib/X11/Imakefile.orig	Thu Apr  8 23:51:16 2004
+++ lib/X11/Imakefile	Thu Apr  8 23:53:08 2004
@@ -10,7 +10,7 @@
         HEADERS = Xlib.h Xresource.h Xutil.h cursorfont.h Xlibint.h \
 			Xcms.h Xlocale.h XKBlib.h
 
-#if BuildServersOnly && !XnestServer && !BuildGLXLibrary && !BuildClients
+#if BuildServersOnly && !XnestServer && !BuildGLXLibrary && !BuildClients && !FreeBSDBuildXxserv
 all::
 
 BuildIncludes($(HEADERS),IncSubdir,..)
@@ -1041,8 +1041,10 @@
 #if InstallXcmsTxt
 InstallNonExecFile(Xcms.txt,$(LIBDIR))
 #endif
+#if defined(FreeBSDBuildXlib) && FreeBSDBuildXlib
 InstallNonExecFile(XErrorDB,$(LIBDIR))
 InstallNonExecFile(XKeysymDB,$(LIBDIR))
+#endif
 InstallLintLibrary(X11,$(LINTLIBDIR))
 
 
