Allow setting --docdir

diff --git a/configure b/configure
index 71fb164f891224bfae34ca6125ff05139f0874af..6b822f6bc485fc77553746d5dd7988ec2593d645 100755 (executable)
--- a/configure
+++ b/configure
@@ -671,6 +671,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'.
@@ -1116,6 +1117,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=""
@@ -1797,6 +1799,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

diff --git a/mk/install.mk b/mk/install.mk
index d2e5449a2f513f0814d321bc09e8a0b75fe7e618..be212869f0103517b8856b0ff1bed4b65e58ed86 100644 (file)
--- a/mk/install.mk
+++ b/mk/install.mk
@@ -12,7 +12,8 @@ RUN_INSTALLER = cd tmp/empty_dir && \
        sh ../../tmp/dist/$(1)/install.sh \
                --prefix="$(DESTDIR)$(CFG_PREFIX)" \
                --libdir="$(DESTDIR)$(CFG_LIBDIR)" \
-               --mandir="$(DESTDIR)$(CFG_MANDIR)"
+               --mandir="$(DESTDIR)$(CFG_MANDIR)" \
+               --docdir="$(DESTDIR)$(CFG_DOCDIR)"
 
 install:
 ifeq (root user, $(USER) $(patsubst %,user,$(SUDO_USER)))