diff options
| author | bors <bors@rust-lang.org> | 2016-09-12 01:33:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-12 01:33:40 -0700 |
| commit | 00ce2c0ffa93bd13b52037dfd9b70d3fc68c943c (patch) | |
| tree | 132bf8fdbdd95da362a9c5d1782287b8a71bc5ed /configure | |
| parent | 4d9132357fce86c772a9101a0df8aa4261904ac7 (diff) | |
| parent | 5e9149d73f7d2912079f08e48eb257e8a6d4f0b3 (diff) | |
| download | rust-00ce2c0ffa93bd13b52037dfd9b70d3fc68c943c.tar.gz rust-00ce2c0ffa93bd13b52037dfd9b70d3fc68c943c.zip | |
Auto merge of #36360 - orbea:docdir, r=alexcrichton
Allow setting --docdir This will allow setting `--docdir` during configure, this is useful because not all linux distributions install documentation to `/usr/share/doc`. For example in Slackware documentation is installed to `/usr/doc/$PRGNAM-$VERSION` and `/usr/share/doc` is a symlink to `/usr/doc`. To use this `./configure --docdir=/usr/doc/$PRGNAM-$VERSION` can be used.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/configure b/configure index 90ead49cdb4..a8bd3acdff1 100755 --- a/configure +++ b/configure @@ -676,6 +676,7 @@ valopt_nosave local-rust-root "/usr/local" "set prefix for local rust binary" valopt_nosave host "${CFG_BUILD}" "GNUs ./configure syntax LLVM host triples" valopt_nosave target "${CFG_HOST}" "GNUs ./configure syntax LLVM target triples" valopt_nosave mandir "${CFG_PREFIX}/share/man" "install man pages in PATH" +valopt_nosave docdir "${CFG_PREFIX}/share/doc/rust" "install man pages in PATH" # On Windows this determines root of the subtree for target libraries. # Host runtime libs always go to 'bin'. @@ -1124,6 +1125,7 @@ putvar CFG_STDCPP_NAME # a little post-processing of various config values CFG_PREFIX=${CFG_PREFIX%/} CFG_MANDIR=${CFG_MANDIR%/} +CFG_DOCDIR=${CFG_DOCDIR%/} CFG_HOST="$(echo $CFG_HOST | tr ',' ' ')" CFG_TARGET="$(echo $CFG_TARGET | tr ',' ' ')" CFG_SUPPORTED_TARGET="" @@ -1805,6 +1807,7 @@ putvar CFG_ARMV7_LINUX_ANDROIDEABI_NDK putvar CFG_I686_LINUX_ANDROID_NDK putvar CFG_NACL_CROSS_PATH putvar CFG_MANDIR +putvar CFG_DOCDIR putvar CFG_USING_LIBCPP # Avoid spurious warnings from clang by feeding it original source on |