diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-03-12 07:29:34 -0500 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-03-14 13:50:38 -0700 |
| commit | 21f70cad19474a6f3ba419e03c0df12881ed1092 (patch) | |
| tree | c12538233a8b79b534d6108e3ec976f2171aa358 | |
| parent | d3adf2d9350bee4125107e2ea1ed0c51bb736562 (diff) | |
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 <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | hw/xfree86/Makefile.am | 6 | ||||
| -rw-r--r-- | hw/xfree86/doc/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xfree86/man/Makefile.am (renamed from hw/xfree86/doc/man/Makefile.am) | 0 | ||||
| -rw-r--r-- | hw/xfree86/man/Xorg.man (renamed from hw/xfree86/doc/man/Xorg.man) | 0 | ||||
| -rw-r--r-- | hw/xfree86/man/xorg.conf.d.man (renamed from hw/xfree86/doc/man/xorg.conf.d.man) | 0 | ||||
| -rw-r--r-- | hw/xfree86/man/xorg.conf.man (renamed from hw/xfree86/doc/man/xorg.conf.man) | 0 |
7 files changed, 4 insertions, 6 deletions
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 index 80e22cbab..80e22cbab 100644 --- a/hw/xfree86/doc/man/Makefile.am +++ b/hw/xfree86/man/Makefile.am diff --git a/hw/xfree86/doc/man/Xorg.man b/hw/xfree86/man/Xorg.man index 6fa334cc3..6fa334cc3 100644 --- a/hw/xfree86/doc/man/Xorg.man +++ b/hw/xfree86/man/Xorg.man diff --git a/hw/xfree86/doc/man/xorg.conf.d.man b/hw/xfree86/man/xorg.conf.d.man index 6b3379ece..6b3379ece 100644 --- a/hw/xfree86/doc/man/xorg.conf.d.man +++ b/hw/xfree86/man/xorg.conf.d.man diff --git a/hw/xfree86/doc/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man index e3fd0eadf..e3fd0eadf 100644 --- a/hw/xfree86/doc/man/xorg.conf.man +++ b/hw/xfree86/man/xorg.conf.man |