]> git.lizzy.rs Git - rust.git/commitdiff
mk: Restore DESTDIR
authorBrian Anderson <banderson@mozilla.com>
Sat, 29 Mar 2014 03:55:45 +0000 (20:55 -0700)
committerBrian Anderson <banderson@mozilla.com>
Sat, 29 Mar 2014 03:55:45 +0000 (20:55 -0700)
mk/install.mk

index 6b639c33cf8b7847f827b6c697b840627f559b68..ca9497444f08dd1d21e18bbc194bd2a2d9863392 100644 (file)
@@ -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)