Rollup merge of #38299 - achanda:ctrl-c, r=brson

[rust.git] / mk / install.mk

diff --git a/mk/install.mk b/mk/install.mk
index 6d9d86c3eb8bc2e080e885165cfb1bb5682c36c3..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)))
@@ -108,7 +109,7 @@ endif
 define INSTALL_RUNTIME_TARGET_N
 install-runtime-target-$(1)-host-$(2): $$(TSREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
        $$(Q)$$(call ADB_SHELL,mkdir,$(CFG_RUNTIME_PUSH_DIR))
-       $$(Q)$$(foreach crate,$$(TARGET_CRATES), \
+       $$(Q)$$(foreach crate,$$(TARGET_CRATES_$(1)), \
            $$(call ADB_PUSH,$$(TL$(1)$(2))/$$(call CFG_LIB_GLOB_$(1),$$(crate)), \
                        $$(CFG_RUNTIME_PUSH_DIR));)
 endef
@@ -116,12 +117,12 @@ endef
 define INSTALL_RUNTIME_TARGET_CLEANUP_N
 install-runtime-target-$(1)-cleanup:
        $$(Q)$$(call ADB,remount)
-       $$(Q)$$(foreach crate,$$(TARGET_CRATES), \
+       $$(Q)$$(foreach crate,$$(TARGET_CRATES_$(1)), \
            $$(call ADB_SHELL,rm,$$(CFG_RUNTIME_PUSH_DIR)/$$(call CFG_LIB_GLOB_$(1),$$(crate)));)
 endef
 
 $(foreach target,$(CFG_TARGET), \
- $(if $(findstring $(CFG_ADB_DEVICE_STATUS),true), \
+ $(if $(findstring $(CFG_ADB_DEVICE_STATUS),"true"), \
   $(eval $(call INSTALL_RUNTIME_TARGET_N,$(taget),$(CFG_BUILD))) \
   $(eval $(call INSTALL_RUNTIME_TARGET_CLEANUP_N,$(target))) \
   ))