From 2102fdd0a58e18aeaa842b2ec73b6071970fafb7 Mon Sep 17 00:00:00 2001
From: "Jeremy C. Reed" <reed@reedmedia.net>
Date: Fri, 26 May 2006 00:12:18 +0000
Subject: [PATCH] RGB color database and XErrorDB install to "share" not "lib"
 by default (by     app/rgb and libX11). TODO: They are customizable, so maybe
 cpprules.in should be extended.

---
 ChangeLog                            | 9 +++++++++
 doc/Xserver.man.pre                  | 6 +++---
 hw/xfree86/doc/man/Xorg.man.pre      | 6 +++---
 hw/xfree86/doc/man/xorg.conf.man.pre | 4 ++--
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 087c3aacc..3ca37b0aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-05-25  Jeremy C. Reed  <reed@reedmedia.net>
+
+	* doc/Xserver.man.pre:
+	* hw/xfree86/doc/man/Xorg.man.pre:
+	* hw/xfree86/doc/man/xorg.conf.man.pre:
+	RGB color database and XErrorDB install to "share" not
+	"lib" by default (by app/rgb and libX11). (TODO: They are
+	customizable, so maybe cpprules.in should be extended.)
+
 2006-05-25  Jeremy C. Reed  <reed@reedmedia.net>
 
 	reviewed by: Adam Jackson
diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
index d73f55993..b9597f15c 100644
--- a/doc/Xserver.man.pre
+++ b/doc/Xserver.man.pre
@@ -1,5 +1,5 @@
 .\" $Xorg: Xserver.man,v 1.4 2001/02/09 02:04:07 xorgcvs Exp $
-.\" $XdotOrg: $
+.\" $XdotOrg: xserver/xorg/doc/Xserver.man.pre,v 1.4 2005/12/23 20:11:12 alanc Exp $
 .\" Copyright 1984 - 1991, 1993, 1994, 1998  The Open Group
 .\"
 .\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -125,7 +125,7 @@ Not obeyed by all servers.
 .TP 8
 .B \-co \fIfilename\fP
 sets name of RGB color database.  The default is
-.IR __projectroot__/lib/X11/rgb .
+.IR __projectroot__/share/X11/rgb .
 .ig
 .TP 8
 .B \-config \fIfilename\fP
@@ -742,7 +742,7 @@ Bitmap font directories
 .IR __projectroot__/lib/X11/fonts/TTF , __projectroot__/lib/X11/fonts/Type1
 Outline font directories
 .TP 30
-.I __projectroot__/lib/X11/rgb.txt
+.I __projectroot__/share/X11/rgb.txt
 Color database
 .TP 30
 .I /tmp/.X11-unix/X\fBn\fP
diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre
index f57dfd607..b7fa990bb 100644
--- a/hw/xfree86/doc/man/Xorg.man.pre
+++ b/hw/xfree86/doc/man/Xorg.man.pre
@@ -1,4 +1,4 @@
-.\" $XdotOrg: xc/programs/Xserver/hw/xfree86/Xorg.man,v 1.2 2004/04/23 19:20:02 eich Exp $
+.\" $XdotOrg: xserver/xorg/hw/xfree86/doc/man/Xorg.man.pre,v 1.3 2005/07/04 18:41:01 ajax Exp $
 .TH __xservername__ __appmansuffix__ __vendorversion__
 .SH NAME
 __xservername__ - X11R6 X server
@@ -571,10 +571,10 @@ Libraries.
 .B __projectroot__/lib/X11/fonts/\(**
 Fonts.
 .TP 30
-.B __projectroot__/lib/X11/rgb.txt
+.B __projectroot__/share/X11/rgb.txt
 Color names to RGB mapping.
 .TP 30
-.B __projectroot__/lib/X11/XErrorDB
+.B __projectroot__/share/X11/XErrorDB
 Client error message database.
 .TP 30
 .B __projectroot__/lib/X11/app-defaults/\(**
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index e599c2706..7efdb5ef6 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -1,4 +1,4 @@
-.\" $XdotOrg: xc/programs/Xserver/hw/xfree86/xorg.conf.man,v 1.3 2005/03/22 21:30:43 ajax Exp $
+.\" $XdotOrg: xserver/xorg/hw/xfree86/doc/man/xorg.conf.man.pre,v 1.6 2005/12/19 16:44:21 ajax Exp $
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH __xconfigfile__ __filemansuffix__ __vendorversion__
@@ -343,7 +343,7 @@ When this entry is not specified in the config file, the server falls back
 to the compiled-in default RGB path, which is:
 .PP
 .RS 11
-.I __projectroot__/lib/X11/rgb
+.I __projectroot__/share/X11/rgb
 .RE
 .PP
 Note that an implicit