From 21f70cad19474a6f3ba419e03c0df12881ed1092 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sat, 12 Mar 2011 07:29:34 -0500 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: Dan Nicholson Signed-off-by: Gaetan Nadon Signed-off-by: Keith Packard --- configure.ac | 2 +- hw/xfree86/Makefile.am | 6 ++---- hw/xfree86/doc/Makefile.am | 2 +- hw/xfree86/{doc => }/man/Makefile.am | 0 hw/xfree86/{doc => }/man/Xorg.man | 0 hw/xfree86/{doc => }/man/xorg.conf.d.man | 0 hw/xfree86/{doc => }/man/xorg.conf.man | 0 7 files changed, 4 insertions(+), 6 deletions(-) rename hw/xfree86/{doc => }/man/Makefile.am (100%) rename hw/xfree86/{doc => }/man/Xorg.man (100%) rename hw/xfree86/{doc => }/man/xorg.conf.d.man (100%) rename hw/xfree86/{doc => }/man/xorg.conf.man (100%) diff --git a/configure.ac b/configure.ac index 681f9d9c5..7eb4151c2 100644 --- a/configure.ac +++ b/configure.ac @@ -2205,7 +2205,6 @@ hw/xfree86/dixmods/Makefile hw/xfree86/dixmods/extmod/Makefile hw/xfree86/doc/Makefile hw/xfree86/doc/devel/Makefile -hw/xfree86/doc/man/Makefile hw/xfree86/doc/sgml/Makefile hw/xfree86/dri/Makefile hw/xfree86/dri2/Makefile @@ -2216,6 +2215,7 @@ hw/xfree86/fbdevhw/man/Makefile hw/xfree86/i2c/Makefile hw/xfree86/int10/Makefile hw/xfree86/loader/Makefile +hw/xfree86/man/Makefile hw/xfree86/modes/Makefile hw/xfree86/os-support/Makefile hw/xfree86/os-support/bsd/Makefile diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index c23b1fd6c..09d875b5d 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -27,17 +27,15 @@ if INT10MODULE INT10_SUBDIR = int10 endif -DOC_SUBDIR = doc - SUBDIRS = common ddc i2c x86emu $(INT10_SUBDIR) fbdevhw os-support parser \ ramdac shadowfb $(VBE_SUBDIR) $(VGAHW_SUBDIR) $(XAA_SUBDIR) \ loader dixmods exa modes \ - $(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR) + $(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) doc man DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \ parser ramdac shadowfb vbe vgahw xaa \ loader dixmods dri dri2 exa modes \ - utils doc + utils doc man bin_PROGRAMS = Xorg Xorg_SOURCES = xorg.c diff --git a/hw/xfree86/doc/Makefile.am b/hw/xfree86/doc/Makefile.am index 80217365d..ac316e0a5 100644 --- a/hw/xfree86/doc/Makefile.am +++ b/hw/xfree86/doc/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = devel man sgml +SUBDIRS = devel sgml EXTRA_DIST = \ README.modes diff --git a/hw/xfree86/doc/man/Makefile.am b/hw/xfree86/man/Makefile.am similarity index 100% rename from hw/xfree86/doc/man/Makefile.am rename to hw/xfree86/man/Makefile.am diff --git a/hw/xfree86/doc/man/Xorg.man b/hw/xfree86/man/Xorg.man similarity index 100% rename from hw/xfree86/doc/man/Xorg.man rename to hw/xfree86/man/Xorg.man diff --git a/hw/xfree86/doc/man/xorg.conf.d.man b/hw/xfree86/man/xorg.conf.d.man similarity index 100% rename from hw/xfree86/doc/man/xorg.conf.d.man rename to hw/xfree86/man/xorg.conf.d.man diff --git a/hw/xfree86/doc/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man similarity index 100% rename from hw/xfree86/doc/man/xorg.conf.man rename to hw/xfree86/man/xorg.conf.man