blob: 43c8f7db76e5dfc4419f992a3a382b6b4db9572d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
diff --git a/configure b/configure
index 59a3c1c..84c64bf 100755
--- a/configure
+++ b/configure
@@ -683,7 +683,6 @@ 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 documentation in PATH"
# On Windows this determines root of the subtree for target libraries.
# Host runtime libs always go to 'bin'.
@@ -1129,7 +1128,6 @@ 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=""
@@ -1811,7 +1809,6 @@ 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 be21286..d2e5449 100644
--- a/mk/install.mk
+++ b/mk/install.mk
@@ -12,8 +12,7 @@ RUN_INSTALLER = cd tmp/empty_dir && \
sh ../../tmp/dist/$(1)/install.sh \
--prefix="$(DESTDIR)$(CFG_PREFIX)" \
--libdir="$(DESTDIR)$(CFG_LIBDIR)" \
- --mandir="$(DESTDIR)$(CFG_MANDIR)" \
- --docdir="$(DESTDIR)$(CFG_DOCDIR)"
+ --mandir="$(DESTDIR)$(CFG_MANDIR)"
install:
ifeq (root user, $(USER) $(patsubst %,user,$(SUDO_USER)))
|