diff options
| author | bors <bors@rust-lang.org> | 2015-12-09 07:48:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-12-09 07:48:58 +0000 |
| commit | 8951b3834bb4fabbfffcae6670a96ec495a4a5e2 (patch) | |
| tree | dafdfd9c9e4a63bb9cc141195f12e7f040a18f89 | |
| parent | 6f95ae612432b38ebdd92c709f2608840f116280 (diff) | |
| parent | 9002600486b484cdd859b8af82e4cc0530b62d94 (diff) | |
| download | rust-8951b3834bb4fabbfffcae6670a96ec495a4a5e2.tar.gz rust-8951b3834bb4fabbfffcae6670a96ec495a4a5e2.zip | |
Auto merge of #30246 - untitaker:insaller, r=alexcrichton
None
| -rw-r--r-- | mk/install.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mk/install.mk b/mk/install.mk index 8b8170220c9..af6f3ff6ad2 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -8,7 +8,7 @@ # option. This file may not be copied, modified, or distributed # except according to those terms. -RUN_INSALLER = cd tmp/empty_dir && \ +RUN_INSTALLER = cd tmp/empty_dir && \ sh ../../tmp/dist/$(1)/install.sh \ --prefix="$(DESTDIR)$(CFG_PREFIX)" \ --libdir="$(DESTDIR)$(CFG_LIBDIR)" \ @@ -22,11 +22,11 @@ else $(Q)$(MAKE) prepare_install endif ifeq ($(CFG_DISABLE_DOCS),) - $(Q)$(call RUN_INSALLER,$(DOC_PKG_NAME)-$(CFG_BUILD)) --disable-ldconfig + $(Q)$(call RUN_INSTALLER,$(DOC_PKG_NAME)-$(CFG_BUILD)) --disable-ldconfig endif $(Q)$(foreach target,$(CFG_TARGET),\ - ($(call RUN_INSALLER,$(STD_PKG_NAME)-$(target)) --disable-ldconfig);) - $(Q)$(call RUN_INSALLER,$(PKG_NAME)-$(CFG_BUILD)) + ($(call RUN_INSTALLER,$(STD_PKG_NAME)-$(target)) --disable-ldconfig);) + $(Q)$(call RUN_INSTALLER,$(PKG_NAME)-$(CFG_BUILD)) # Remove tmp files because it's a decent amount of disk space $(Q)rm -R tmp/dist @@ -40,11 +40,11 @@ else $(Q)$(MAKE) prepare_uninstall endif ifeq ($(CFG_DISABLE_DOCS),) - $(Q)$(call RUN_INSALLER,$(DOC_PKG_NAME)-$(CFG_BUILD)) --uninstall + $(Q)$(call RUN_INSTALLER,$(DOC_PKG_NAME)-$(CFG_BUILD)) --uninstall endif - $(Q)$(call RUN_INSALLER,$(PKG_NAME)-$(CFG_BUILD)) --uninstall + $(Q)$(call RUN_INSTALLER,$(PKG_NAME)-$(CFG_BUILD)) --uninstall $(Q)$(foreach target,$(CFG_TARGET),\ - ($(call RUN_INSALLER,$(STD_PKG_NAME)-$(target)) --uninstall);) + ($(call RUN_INSTALLER,$(STD_PKG_NAME)-$(target)) --uninstall);) # Remove tmp files because it's a decent amount of disk space $(Q)rm -R tmp/dist |