mk: Don't touch config.tmp or tmp/dist as root. Closes #13190

When running `make install` we are touching these files that can't
then be removed later.

diff --git a/mk/install.mk b/mk/install.mk
index ca9497444f08dd1d21e18bbc194bd2a2d9863392..bcc2a5fbaaac05624bd45f08572e447217633d98 100644 (file)
--- 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 5674b0a5045c96914d3a653f237cb87e9675226b..dc09c7dfd00da7d3e787904162a7aea07f31c7a0 100644 (file)
--- 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() {