File tree Expand file tree Collapse file tree 2 files changed +5
-1
lines changed Expand file tree Collapse file tree 2 files changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -671,6 +671,7 @@ valopt_nosave local-rust-root "/usr/local" "set prefix for local rust binary"
671671valopt_nosave host " ${CFG_BUILD} " " GNUs ./configure syntax LLVM host triples"
672672valopt_nosave target " ${CFG_HOST} " " GNUs ./configure syntax LLVM target triples"
673673valopt_nosave mandir " ${CFG_PREFIX} /share/man" " install man pages in PATH"
674+ valopt_nosave docdir " ${CFG_PREFIX} /share/doc/rust" " install man pages in PATH"
674675
675676# On Windows this determines root of the subtree for target libraries.
676677# Host runtime libs always go to 'bin'.
@@ -1116,6 +1117,7 @@ putvar CFG_STDCPP_NAME
11161117# a little post-processing of various config values
11171118CFG_PREFIX=${CFG_PREFIX%/ }
11181119CFG_MANDIR=${CFG_MANDIR%/ }
1120+ CFG_DOCDIR=${CFG_DOCDIR%/ }
11191121CFG_HOST=" $( echo $CFG_HOST | tr ' ,' ' ' ) "
11201122CFG_TARGET=" $( echo $CFG_TARGET | tr ' ,' ' ' ) "
11211123CFG_SUPPORTED_TARGET=" "
@@ -1797,6 +1799,7 @@ putvar CFG_ARMV7_LINUX_ANDROIDEABI_NDK
17971799putvar CFG_I686_LINUX_ANDROID_NDK
17981800putvar CFG_NACL_CROSS_PATH
17991801putvar CFG_MANDIR
1802+ putvar CFG_DOCDIR
18001803putvar CFG_USING_LIBCPP
18011804
18021805# Avoid spurious warnings from clang by feeding it original source on
Original file line number Diff line number Diff line change @@ -12,7 +12,8 @@ RUN_INSTALLER = cd tmp/empty_dir && \
1212 sh ../../tmp/dist/$(1 ) /install.sh \
1313 --prefix="$(DESTDIR )$(CFG_PREFIX ) " \
1414 --libdir="$(DESTDIR )$(CFG_LIBDIR ) " \
15- --mandir="$(DESTDIR )$(CFG_MANDIR ) "
15+ --mandir="$(DESTDIR )$(CFG_MANDIR ) " \
16+ --docdir="$(DESTDIR )$(CFG_DOCDIR ) "
1617
1718install :
1819ifeq (root user, $(USER ) $(patsubst % ,user,$(SUDO_USER ) ) )
You can’t perform that action at this time.
0 commit comments