Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.99
diff -u -2 -0 -r1.99 ChangeLog
--- xc/ChangeLog	18 Jul 2004 22:19:33 -0000	1.99
+++ xc/ChangeLog	19 Jul 2004 21:01:39 -0000
@@ -1,20 +1,27 @@
+2004-07-19 Roland Mainz <roland.mainz@nrubsig.org>
+        * xc/config/cf/X11.tmpl
+        * xc/doc/hardcopy/Imakefile
+        * xc/doc/hardcopy/XPRINT/Imakefile
+        Bugzilla #891: Fixing some installation problems with hardcopy
+        dirs.
+        
 2004-07-18  Rik Faith  <faith(at)freedesktop.org>
 
 	* programs/Xserver/hw/dmx/dmxextension.c:
 	(dmxAdjustCursorBoundaries):
 	Addition of console input after removal of core backend input that
 	is not on screen 0 can cause a segfault.  Fix by preventing
 	reinitialization of detached inputs.
 	* programs/Xserver/hw/dmx/dmxgcops.c: (dmxFindAlternatePixmap),
 	(dmxGetImage):
 	When Xinerama is active and screen 0 is detached, pixmaps for
 	XGetImage must be obtained from another screen.
 	
 2004-07-18 Roland Mainz <roland.mainz@nrubsig.org>
 	* xc/programs/Xserver/Xprint/ps/Ps.h
 	* xc/programs/Xserver/Xprint/ps/PsColor.c
 	* xc/programs/Xserver/Xprint/ps/PsGC.c 
         Bugzilla #858: Fixing the problem that clients cannot use the
         TrueColor visual without calling |XInstallColormap();|.
 
 2004-07-17  Eric Anholt  <anholt@FreeBSD.org>
Index: xc/config/cf/X11.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/X11.tmpl,v
retrieving revision 1.15
diff -u -2 -0 -r1.15 X11.tmpl
--- xc/config/cf/X11.tmpl	17 Jul 2004 21:14:36 -0000	1.15
+++ xc/config/cf/X11.tmpl	19 Jul 2004 21:01:50 -0000
@@ -675,45 +675,45 @@
 
 #ifndef BuildAppleWMLibrary
 #define BuildAppleWMLibrary	NO
 #endif
 
 #ifndef BuildWindowsWMLibrary
 #define BuildWindowsWMLibrary	NO
 #endif
 
 #ifndef BuildMiscDocs
 #define BuildMiscDocs		NO
 #endif
 #ifndef BuildSpecsDocs
 #define BuildSpecsDocs		NO
 #endif
 #ifndef BuildAllSpecsDocs
 #define BuildAllSpecsDocs	NO
 #endif
 
 #ifndef InstallHardcopyDocs
-#define InstallHardcopyDocs	NO
+#define InstallHardcopyDocs	YES
 #endif
 
 #ifndef InstallMiscManPages
-#define InstallMiscManPages	NO
+#define InstallMiscManPages	YES
 #endif
 
 #ifndef FSUseSyslog
 #define FSUseSyslog		NO
 #endif
 
 #ifndef InstallLibManPages
 #define InstallLibManPages	YES
 #endif
 #ifndef InstallXtermSetUID
 #define InstallXtermSetUID	YES	/* xterm needs to be set uid */
 #endif
 #ifndef InstallXloadSetGID
 #define InstallXloadSetGID	YES	/* xload often needs set gid kmem */
 #endif
 #ifndef InstallXinitConfig
 #define InstallXinitConfig	NO	/* install sample xinit config */
 #endif
 #ifndef InstallXdmConfig
 #define InstallXdmConfig	NO	/* install sample xdm config */
Index: xc/doc/hardcopy/Imakefile
===================================================================
RCS file: /cvs/xorg/xc/doc/hardcopy/Imakefile,v
retrieving revision 1.2
diff -u -2 -0 -r1.2 Imakefile
--- xc/doc/hardcopy/Imakefile	23 Apr 2004 18:42:01 -0000	1.2
+++ xc/doc/hardcopy/Imakefile	19 Jul 2004 21:01:50 -0000
@@ -1,13 +1,15 @@
 XCOMM $XFree86: xc/doc/specs/Imakefile,v 1.3 2000/03/02 17:52:57 dawes Exp $
 
-HARDCOPYDOCDIRS = HardcopyDocDirs
-
 #define IHaveSubdirs
 #define PassCDebugFlags
 
-SUBDIRS = $(HARDCOPYDOCDIRS) XPRINT
+#if defined(HardcopyDocDirs) && !BuildAllHardcopyDocs
+SUBDIRS = HardcopyDocDirs
+#else
+SUBDIRS = RX XKB XPRINT
+#endif /* defined(HardcopyDocDirs) && !BuildAllHardcopyDocs */
 
 all::
 
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
Index: xc/doc/hardcopy/XPRINT/Imakefile
===================================================================
RCS file: /cvs/xorg/xc/doc/hardcopy/XPRINT/Imakefile,v
retrieving revision 1.2
diff -u -2 -0 -r1.2 Imakefile
--- xc/doc/hardcopy/XPRINT/Imakefile	23 Apr 2004 18:42:05 -0000	1.2
+++ xc/doc/hardcopy/XPRINT/Imakefile	19 Jul 2004 21:01:50 -0000
@@ -1,10 +1,13 @@
+XCOMM $Xorg: Imakefile,v 1.1 2004/07/19 19:41:53 gisburn Exp $
 
+InstallHardcopyDoc(dtprint_fspec,dtprint_fspec.PS.gz)
+InstallDoc(Xprint_FAQ,Xprint_FAQ.html Xprint_FAQ.txt)
 
 #ifdef HasDocBookTools
 all:: Xprint_FAQ.html Xprint_FAQ.txt
 
 ConvertDocBookToHTML(Xprint_FAQ.xml, Xprint_FAQ.html)
 
 Xprint_FAQ.txt: Xprint_FAQ.html
 	lynx -dump Xprint_FAQ.html | fgrep -v "file://localhost/" >Xprint_FAQ.txt
 #endif /* HasDocBookTools */