From 221507e3bf6fcaa4a4c2e1bc264a1f806b4362c0 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Thu, 28 Apr 2011 21:16:13 -0400 Subject: [PATCH] man: relocate manual pages in the man subdir outside doc The convention is to have the manual pages in a man subdir which is not under a doc dir. The doc dir contains users docs. This will move man pages out of the way for upcoming DocBook patches. Reviewed-by Jeremy Huddleston Signed-off-by: Gaetan Nadon Signed-off-by: Keith Packard --- Makefile.am | 2 ++ configure.ac | 2 +- doc/Makefile.am | 2 +- {doc/man => man}/Makefile.am | 0 {doc/man => man}/Xserver.man | 0 5 files changed, 4 insertions(+), 2 deletions(-) rename {doc/man => man}/Makefile.am (100%) rename {doc/man => man}/Xserver.man (100%) diff --git a/Makefile.am b/Makefile.am index 62c8d9501..cea140bea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ endif SUBDIRS = \ doc \ + man \ include \ dix \ fb \ @@ -68,6 +69,7 @@ dist-hook: ChangeLog INSTALL DIST_SUBDIRS = \ doc \ + man \ include \ dix \ fb \ diff --git a/configure.ac b/configure.ac index c6b16b5de..e23274c67 100644 --- a/configure.ac +++ b/configure.ac @@ -2151,10 +2151,10 @@ damageext/Makefile dbe/Makefile dix/Makefile doc/Makefile -doc/man/Makefile doc/xml/Makefile doc/xml/dtrace/Makefile doc/xml/xserver.ent +man/Makefile fb/Makefile record/Makefile config/Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am index 4c08b6f42..b9015bcf6 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = man xml +SUBDIRS = xml dist_noinst_DATA = smartsched diff --git a/doc/man/Makefile.am b/man/Makefile.am similarity index 100% rename from doc/man/Makefile.am rename to man/Makefile.am diff --git a/doc/man/Xserver.man b/man/Xserver.man similarity index 100% rename from doc/man/Xserver.man rename to man/Xserver.man