xserver: Branch 'master' - 2 commits

[Jeremy C. Reed]

 cpprules.in                     |    1 +
 hw/xfree86/doc/man/Xorg.man.pre |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
diff-tree d56249a15ead51ad4d2117d5538ada24af05b693 (from parents)
Merge: f1f8df1889ab656bb57596e2f85408f15f42cd5d ec84f72d077eaf2e7768a1f5398f65a5e1714d08
Author: Jeremy C. Reed <reed at glacier.reedmedia.net>
Date:   Fri Dec 8 15:52:37 2006 -0600

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver

diff-tree f1f8df1889ab656bb57596e2f85408f15f42cd5d (from f17e3c34dfd1f1418440bdebf45764e4dbf550f0)
Author: Jeremy C. Reed <reed at glacier.reedmedia.net>
Date:   Fri Dec 8 15:51:44 2006 -0600

    For MANDEFS, also replace __mandir__ for $(mandir) which includes
    the prefix. Noticed wrong path to man pages on both Ubuntu and on
    NetBSD with pkgsrc.

diff --git a/cpprules.in b/cpprules.in
index 667b133..4901ea8 100644
--- a/cpprules.in
+++ b/cpprules.in
@@ -34,6 +34,7 @@ MANDEFS = \
 	-D__miscmansuffix__=$(MISC_MAN_SUFFIX) \
 	-D__drivermansuffix__=$(DRIVER_MAN_SUFFIX) \
 	-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
+	-D__mandir__=$(mandir) \
 	-D__projectroot__=$(prefix) \
 	-D__xconfigfile__=$(__XCONFIGFILE__) -D__xconfigdir__=$(XCONFIGDIR) \
 	-D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME) 
diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre
index b7fa990..d91b796 100644
--- a/hw/xfree86/doc/man/Xorg.man.pre
+++ b/hw/xfree86/doc/man/Xorg.man.pre
@@ -580,7 +580,7 @@ Client error message database.
 .B __projectroot__/lib/X11/app-defaults/\(**
 Client resource specifications.
 .TP 30
-.B __projectroot__/man/man?/\(**
+.B __mandir__/man?/\(**
 Manual pages.
 .TP 30
 .BI /etc/X n .hosts