Skip to content

Commit

Permalink
mk: Restore DESTDIR
Browse files Browse the repository at this point in the history
  • Loading branch information
@brson
brson committed Mar 29, 2014
1 parent c5f8ca5 commit 2161719
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions mk/install.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

5 comments on commit 2161719

@bors
Copy link
Contributor

@bors bors commented on 2161719 Mar 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at brson@2161719

@bors
Copy link
Contributor

@bors bors commented on 2161719 Mar 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging brson/rust/dist = 2161719 into auto

@bors
Copy link
Contributor

@bors bors commented on 2161719 Mar 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brson/rust/dist = 2161719 merged ok, testing candidate = 74128b1

@bors
Copy link
Contributor

@bors bors commented on 2161719 Mar 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/4948
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/4951
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/4042
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/4054
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/5050
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/4135
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/4143
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/5050
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/4135
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/4140
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/4206
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/1938
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/5047
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/4145
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/4155
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/4812

@bors
Copy link
Contributor

@bors bors commented on 2161719 Mar 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 74128b1

Please sign in to comment.