Skip to content

Commit

Permalink
mk: Fix 'make install'. Closes #13128
Browse files Browse the repository at this point in the history
  • Loading branch information
@brson
brson committed Mar 25, 2014
1 parent 1f5571a commit 1f35f83
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion mk/install.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# The stage we install from
ISTAGE = $(PREPARE_STAGE)

$(eval $(call DEF_PREPARE,mkfile-install))

install: PREPARE_HOST=$(CFG_BUILD)
install: PREPARE_TARGETS=$(CFG_TARGET)
install: PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
Expand All @@ -28,7 +30,7 @@ install: PREPARE_SOURCE_MAN_DIR=$(S)/man
install: PREPARE_DEST_BIN_DIR=$(DESTDIR)$(CFG_PREFIX)/bin
install: PREPARE_DEST_LIB_DIR=$(DESTDIR)$(CFG_LIBDIR)
install: PREPARE_DEST_MAN_DIR=$(DESTDIR)$(CFG_MANDIR)/man1
install: prepare-everything
install: prepare-everything-mkfile-install


# Uninstall code
Expand Down
4 changes: 3 additions & 1 deletion mk/prepare.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,9 @@ prepare-base-$(1): PREPARE_SOURCE_MAN_DIR=$$(S)/man
prepare-base-$(1): PREPARE_DEST_BIN_DIR=$$(PREPARE_DEST_DIR)/bin
prepare-base-$(1): PREPARE_DEST_LIB_DIR=$$(PREPARE_DEST_DIR)/$$(CFG_LIBDIR_RELATIVE)
prepare-base-$(1): PREPARE_DEST_MAN_DIR=$$(PREPARE_DEST_DIR)/share/man/man1
prepare-base-$(1): prepare-host-$(1) prepare-targets-$(1)
prepare-base-$(1): prepare-everything-$(1)

prepare-everything-$(1): prepare-host-$(1) prepare-targets-$(1)

prepare-host-$(1): prepare-host-tools-$(1)

Expand Down

9 comments on commit 1f35f83

@bors
Copy link
Contributor

@bors bors commented on 1f35f83 Mar 25, 2014

Choose a reason for hiding this comment

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

saw approval from cmr
at brson@1f35f83

@bors
Copy link
Contributor

@bors bors commented on 1f35f83 Mar 25, 2014

Choose a reason for hiding this comment

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

merging brson/rust/fix-make-install = 1f35f83 into auto

@bors
Copy link
Contributor

@bors bors commented on 1f35f83 Mar 25, 2014

Choose a reason for hiding this comment

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

brson/rust/fix-make-install = 1f35f83 merged ok, testing candidate = 20a2d9ad

@bors
Copy link
Contributor

@bors bors commented on 1f35f83 Mar 26, 2014

Choose a reason for hiding this comment

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

some tests failed:
failure: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/4979
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/4878
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/4875
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/3979
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/4977
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/4072
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/1869

@bors
Copy link
Contributor

@bors bors commented on 1f35f83 Mar 26, 2014

Choose a reason for hiding this comment

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

saw approval from cmr
at brson@1f35f83

@bors
Copy link
Contributor

@bors bors commented on 1f35f83 Mar 26, 2014

Choose a reason for hiding this comment

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

merging brson/rust/fix-make-install = 1f35f83 into auto

@bors
Copy link
Contributor

@bors bors commented on 1f35f83 Mar 26, 2014

Choose a reason for hiding this comment

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

brson/rust/fix-make-install = 1f35f83 merged ok, testing candidate = 6053102

@bors
Copy link
Contributor

@bors bors commented on 1f35f83 Mar 26, 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/4879
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/4876
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/3972
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/3980
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/4978
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/4065
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/4073
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/4980
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/4065
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/4070
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/4138
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/1870
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/4977
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/4077
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/4085
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/4738

@bors
Copy link
Contributor

@bors bors commented on 1f35f83 Mar 26, 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 = 6053102

Please sign in to comment.