diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-03-25 15:26:51 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-03-25 15:27:47 -0700 |
| commit | 1f35f834be9b3f1dbbe04cc46ac3a8f72fd381c5 (patch) | |
| tree | 41853a56bdc37e769bebf9199be656db93ea0740 | |
| parent | 1f5571abc222520537daa00fc8256040647eec86 (diff) | |
mk: Fix 'make install'. Closes #13128
| -rw-r--r-- | mk/install.mk | 4 | ||||
| -rw-r--r-- | mk/prepare.mk | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mk/install.mk b/mk/install.mk index 6e56767a9d7..57f4db26954 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -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) @@ -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 diff --git a/mk/prepare.mk b/mk/prepare.mk index a4197fdb045..bf626b2101e 100644 --- a/mk/prepare.mk +++ b/mk/prepare.mk @@ -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) |