auto merge of #13219 : brson/rust/dist-root, r=sfackler

rust-lang · Mar 31, 2014 · e63b2d3 · e63b2d3
2 parents 7a70c69 + cfb52a5
commit e63b2d3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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() {