diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-03-28 20:55:45 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-03-28 20:55:45 -0700 |
| commit | 21617190f213e7da06fbe071cb5961a89a91e38f (patch) | |
| tree | e260cfad94dec550a57a1750e8cfb6b711df3ef9 | |
| parent | c5f8ca5be08a01c60a6d80e3a9d35e436e6e2064 (diff) | |
mk: Restore DESTDIR
| -rw-r--r-- | mk/install.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/install.mk b/mk/install.mk index 6b639c33cf8..ca9497444f0 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -15,12 +15,12 @@ MAYBE_DISABLE_VERIFY= endif install: dist-install-dir-$(CFG_BUILD) - $(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(CFG_PREFIX)" --libdir="$(CFG_LIBDIR)" --mandir="$(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 $(Q)rm -R tmp/dist/$(PKG_NAME)-$(CFG_BUILD) uninstall: dist-install-dir-$(CFG_BUILD) - $(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(CFG_PREFIX)" --libdir="$(CFG_LIBDIR)" --mandir="$(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 $(Q)rm -R tmp/dist/$(PKG_NAME)-$(CFG_BUILD) |