about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2021-02-12 19:32:13 +0900
committerGitHub <noreply@github.com>2021-02-12 19:32:13 +0900
commit459dda98ebdb797c233bdb01ace54b3f30b577f8 (patch)
tree665cd8bcbe351998359dfd4a9fbf35ecffb1a27c /src
parent0f47e192bdab877786b909988e3d7ac1eede2373 (diff)
parent5034b504b4e91c8fdc001a6bb5ae5db988feb355 (diff)
downloadrust-459dda98ebdb797c233bdb01ace54b3f30b577f8.tar.gz
rust-459dda98ebdb797c233bdb01ace54b3f30b577f8.zip
Rollup merge of #81968 - pietroalbini:fix-doc-install-path, r=Mark-Simulacrum
bootstrap: fix wrong docs installation path

This PR fixes https://github.com/rust-lang/rust/issues/81967, a regression introduced by https://github.com/rust-lang/rust/pull/80797. The commit has already been backported to stable 1.50.0.

r? ``````@Mark-Simulacrum``````
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/install.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs
index fd0acc3a919..22124ec67f5 100644
--- a/src/bootstrap/install.rs
+++ b/src/bootstrap/install.rs
@@ -29,7 +29,7 @@ fn install_sh(
     let prefix = default_path(&builder.config.prefix, "/usr/local");
     let sysconfdir = prefix.join(default_path(&builder.config.sysconfdir, "/etc"));
     let datadir = prefix.join(default_path(&builder.config.datadir, "share"));
-    let docdir = prefix.join(default_path(&builder.config.docdir, "share/doc"));
+    let docdir = prefix.join(default_path(&builder.config.docdir, "share/doc/rust"));
     let mandir = prefix.join(default_path(&builder.config.mandir, "share/man"));
     let libdir = prefix.join(default_path(&builder.config.libdir, "lib"));
     let bindir = prefix.join(&builder.config.bindir); // Default in config.rs