diff --git a/mk/dist.mk b/mk/dist.mk index d0990dfd72073..93aedb2240d78 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -171,7 +171,7 @@ dist/$(PKG_NAME)-$(1).pkg: $(S)src/etc/pkg/Distribution.xml LICENSE.txt \ --resources tmp/dist/pkgres-$(1) dist/$(PKG_NAME)-$(1).pkg $(Q)rm -rf tmp rust.pkg -tmp/dist/pkgres-$(1)/LICENSE.txt: $(S)/LICENSE.txt +tmp/dist/pkgres-$(1)/LICENSE.txt: LICENSE.txt @$$(call E,pkg resource LICENSE.txt) $(Q)mkdir -p $$(@D) $(Q)cp $$< $$@ diff --git a/mk/install.mk b/mk/install.mk index ca9497444f08d..bcc2a5fbaaac0 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 5674b0a5045c9..dc09c7dfd00da 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() {