Skip to content

Commit 1f35f83

Browse files
committed
mk: Fix 'make install'. Closes #13128
1 parent 1f5571a commit 1f35f83

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

mk/install.mk

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# The stage we install from
1616
ISTAGE = $(PREPARE_STAGE)
1717

18+
$(eval $(call DEF_PREPARE,mkfile-install))
19+
1820
install: PREPARE_HOST=$(CFG_BUILD)
1921
install: PREPARE_TARGETS=$(CFG_TARGET)
2022
install: PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
@@ -28,7 +30,7 @@ install: PREPARE_SOURCE_MAN_DIR=$(S)/man
2830
install: PREPARE_DEST_BIN_DIR=$(DESTDIR)$(CFG_PREFIX)/bin
2931
install: PREPARE_DEST_LIB_DIR=$(DESTDIR)$(CFG_LIBDIR)
3032
install: PREPARE_DEST_MAN_DIR=$(DESTDIR)$(CFG_MANDIR)/man1
31-
install: prepare-everything
33+
install: prepare-everything-mkfile-install
3234

3335

3436
# Uninstall code

mk/prepare.mk

+3-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,9 @@ prepare-base-$(1): PREPARE_SOURCE_MAN_DIR=$$(S)/man
156156
prepare-base-$(1): PREPARE_DEST_BIN_DIR=$$(PREPARE_DEST_DIR)/bin
157157
prepare-base-$(1): PREPARE_DEST_LIB_DIR=$$(PREPARE_DEST_DIR)/$$(CFG_LIBDIR_RELATIVE)
158158
prepare-base-$(1): PREPARE_DEST_MAN_DIR=$$(PREPARE_DEST_DIR)/share/man/man1
159-
prepare-base-$(1): prepare-host-$(1) prepare-targets-$(1)
159+
prepare-base-$(1): prepare-everything-$(1)
160+
161+
prepare-everything-$(1): prepare-host-$(1) prepare-targets-$(1)
160162

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

0 commit comments

Comments
 (0)