Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.103
diff -u -r1.103 ChangeLog
--- xc/ChangeLog	20 Jul 2004 17:48:08 -0000	1.103
+++ xc/ChangeLog	20 Jul 2004 19:25:37 -0000
@@ -1,3 +1,9 @@
+2004-07-19 Roland Mainz <roland.mainz@nrubsig.org>
+        * xc/config/cf/X11.tmpl
+        * xc/doc/man/misc/Imakefile 
+        Bugzilla #899: Fixing Solaris builds bustage caused by the checkin
+        in bug #891.
+
 Tue Jul 20 19:38:06 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* lib/X11/omGeneric.c (parse_fontdata): Set font_data->xlfd_data
Index: xc/config/cf/X11.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/X11.tmpl,v
retrieving revision 1.16
diff -u -r1.16 X11.tmpl
--- xc/config/cf/X11.tmpl	19 Jul 2004 21:07:32 -0000	1.16
+++ xc/config/cf/X11.tmpl	20 Jul 2004 19:25:46 -0000
@@ -4419,14 +4419,12 @@
 	@if [ -f name.ps -a X$(NOPS) = X ]; then set -x; \		@@\
 	  $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) name.ps \		@@\
 		$(DESTDIR)$(DOCPSDIR); \				@@\
-	fi								@@\
-	RemoveOldFile(name.ps,name.PS,$(DOCPSDIR))			@@\
+	fi ; RemoveOldFile(name.ps,name.PS,$(DOCPSDIR))			@@\
 	MakeDir($(DESTDIR)$(DOCDIR))					@@\
 	@if [ -f name.txt -a X$(NOTXT) = X ]; then set -x; \		@@\
 	  $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) name.txt \		@@\
 		$(DESTDIR)$(DOCDIR); \					@@\
-	fi								@@\
-	RemoveOldFile(name.txt,name.TXT,$(DOCDIR))			@@\
+	fi ; RemoveOldFile(name.txt,name.TXT,$(DOCDIR))			@@\
 	MakeDir($(DESTDIR)$(DOCHTMLDIR))				@@\
 	@if [ -f name.html -a X$(NOHTML) = X ]; then (set -x; \		@@\
 	  $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) name.html \	@@\
Index: xc/doc/man/misc/Imakefile
===================================================================
RCS file: /cvs/xorg/xc/doc/man/misc/Imakefile,v
retrieving revision 1.2
diff -u -r1.2 Imakefile
--- xc/doc/man/misc/Imakefile	23 Apr 2004 18:42:15 -0000	1.2
+++ xc/doc/man/misc/Imakefile	20 Jul 2004 19:25:48 -0000
@@ -15,6 +15,9 @@
  * XFree86 Darwin:      XDarwin, dumpkeymap
  */
 
+XF86DRIVERSRC = $(TOP)/programs/Xserver/hw/xfree86/drivers
+XF86SRC       = $(TOP)/programs/Xserver/hw/xfree86
+
 InstallGenManPage(newport,$(DRIVERMANDIR),$(DRIVERMANSUFFIX))
 InstallGenManPage(sunbw2,$(DRIVERMANDIR),$(DRIVERMANSUFFIX))
 InstallGenManPage(suncg14,$(DRIVERMANDIR),$(DRIVERMANSUFFIX))