summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-09-12 12:41:23 +0000
committerbors <bors@rust-lang.org>2017-09-12 12:41:23 +0000
commita7b7dce02da1b10f6da79b2f2e93a73314faf497 (patch)
treeaa4df96baeabd828680fb5b7c8f4d8a97a70e513 /src/bootstrap
parent817e1b81e230d599585f860cdcad96c5ed83b93e (diff)
parentd587558269855870229ae995cc88bd5a0ddcb87b (diff)
downloadrust-a7b7dce02da1b10f6da79b2f2e93a73314faf497.tar.gz
rust-a7b7dce02da1b10f6da79b2f2e93a73314faf497.zip
Auto merge of #44413 - est31:move_man, r=nikomatsakis
Move the man directory to a subdirectory

There is no reason it should be in the top directory.
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/dist.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 8e11e1b0580..9180c7d165a 100644
--- 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",
         ];