Auto merge of rust-lang#44413 - est31:move_man, r=nikomatsakis

Move the man directory to a subdirectory There is no reason it should be in the top directory.
alexcrichton · Sep 12, 2017 · a7b7dce · a7b7dce
2 parents 817e1b8 + d587558
commit a7b7dce
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 2 deletions.
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
@@ -432,7 +432,7 @@ impl Step for Rustc {
 
             // Man pages
             t!(fs::create_dir_all(image.join("share/man/man1")));
-            cp_r(&build.src.join("man"), &image.join("share/man/man1"));
+            cp_r(&build.src.join("src/doc/man"), &image.join("share/man/man1"));
 
             // Debugger scripts
             builder.ensure(DebuggerScripts {
@@ -834,7 +834,6 @@ impl Step for PlainSourceTarball {
             "config.toml.example",
         ];
         let src_dirs = [
-            "man",
             "src",
         ];
 

diff --git a/man/rustc.1 → src/doc/man/rustc.1 b/man/rustc.1 → src/doc/man/rustc.1
diff --git a/man/rustdoc.1 → src/doc/man/rustdoc.1 b/man/rustdoc.1 → src/doc/man/rustdoc.1