提交 cfb52a5d 编写于 作者: B Brian Anderson

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.
上级 4aa7a8a5
...@@ -17,12 +17,12 @@ endif ...@@ -17,12 +17,12 @@ endif
install: dist-install-dir-$(CFG_BUILD) 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)" $(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 # 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) 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)" $(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 # 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
###################################################################### ######################################################################
......
...@@ -45,7 +45,6 @@ putvar() { ...@@ -45,7 +45,6 @@ putvar() {
else else
printf "install: %-20s := %s %s\n" $1 "$T" "$2" printf "install: %-20s := %s %s\n" $1 "$T" "$2"
fi fi
printf "%-20s := %s\n" $1 "$T" >>config.tmp
} }
valopt() { valopt() {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册