diff options
| author | bors <bors@rust-lang.org> | 2014-03-30 21:11:40 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-03-30 21:11:40 -0700 |
| commit | e63b2d30775fdb6661cdd2160bf0111371144bc9 (patch) | |
| tree | 79f0080f66ce4ee02fe28f1602af65f6e1d5436d | |
| parent | 7a70c69a31ece0f0c1d47474b7892fce46ade840 (diff) | |
| parent | cfb52a5d35d2a5f682ce08435b3787b26ca05987 (diff) | |
auto merge of #13219 : brson/rust/dist-root, r=sfackler
| -rw-r--r-- | mk/install.mk | 4 | ||||
| -rw-r--r-- | src/etc/install.sh | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/mk/install.mk b/mk/install.mk index ca9497444f0..bcc2a5fbaaa 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -17,12 +17,12 @@ endif install: dist-install-dir-$(CFG_BUILD) $(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/$(PKG_NAME)-$(CFG_BUILD) + $(Q)rm -R tmp/dist uninstall: dist-install-dir-$(CFG_BUILD) $(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/$(PKG_NAME)-$(CFG_BUILD) + $(Q)rm -R tmp/dist ###################################################################### diff --git a/src/etc/install.sh b/src/etc/install.sh index 5674b0a5045..dc09c7dfd00 100644 --- a/src/etc/install.sh +++ b/src/etc/install.sh @@ -45,7 +45,6 @@ putvar() { else printf "install: %-20s := %s %s\n" $1 "$T" "$2" fi - printf "%-20s := %s\n" $1 "$T" >>config.tmp } valopt() { |