diff options
| author | bors <bors@rust-lang.org> | 2014-07-11 13:51:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-07-11 13:51:39 +0000 |
| commit | b8059f730e07c46c9f89d30c609d1e70ed1a7d82 (patch) | |
| tree | 03c006bc219b228ce326db9e887f60cb571963fc | |
| parent | c9a77d03ddc0b949eabee4b1f25edcf3b9e1251c (diff) | |
| parent | 59ab65b2d915821e5531a9a2d00d62ea2e57c506 (diff) | |
| download | rust-b8059f730e07c46c9f89d30c609d1e70ed1a7d82.tar.gz rust-b8059f730e07c46c9f89d30c609d1e70ed1a7d82.zip | |
auto merge of #15580 : pnkfelix/rust/fsk-fix-15558, r=alexcrichton
Fix #15558.
| -rw-r--r-- | mk/install.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mk/install.mk b/mk/install.mk index 206046faeb6..b9baf6e02e1 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -14,16 +14,18 @@ else MAYBE_DISABLE_VERIFY= endif -install: dist-install-dir-$(CFG_BUILD)-with-target-libs - $(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)" +install: dist-install-dir-$(CFG_BUILD)-with-target-libs | tmp/empty_dir + $(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)" # Remove tmp files while we can because they may have been created under sudo $(Q)rm -R tmp/dist -uninstall: dist-install-dir-$(CFG_BUILD)-with-target-libs - $(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" +uninstall: dist-install-dir-$(CFG_BUILD)-with-target-libs | tmp/empty_dir + $(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" # Remove tmp files while we can because they may have been created under sudo $(Q)rm -R tmp/dist +tmp/empty_dir: + mkdir -p $@ ###################################################################### # Android remote installation |