librustc: Don't try to perform the magical

[rust.git] / mk / install.mk

diff --git a/mk/install.mk b/mk/install.mk
index 7bae272b47aa94a5d1444ff311d4b1eb06cc8b91..206046faeb6ef34e52c9715e4c9ed2d42bd380ef 100644 (file)
--- a/mk/install.mk
+++ b/mk/install.mk
@@ -8,12 +8,21 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
+ifdef CFG_DISABLE_VERIFY_INSTALL
+MAYBE_DISABLE_VERIFY=--disable-verify
+else
+MAYBE_DISABLE_VERIFY=
+endif
 
-install: dist-install-dir-$(CFG_BUILD)
-       $(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(CFG_PREFIX)"
+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)"
+# 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)
-       $(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(CFG_PREFIX)" --uninstall
+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)"
+# Remove tmp files while we can because they may have been created under sudo
+       $(Q)rm -R tmp/dist
 
 
 ######################################################################