Skip to content

Commit e976de3

Browse files
committed
auto merge of #10193 : osaut/rust/Fix_install, r=huonw
Fix missing parentheses coming from a previous substitution '$(PREFIX_ROOT)' to '$(CFG_MANDIR' on 1c4a348
2 parents c7d5a52 + a6cd20b commit e976de3

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

mk/install.mk

+4-4
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ install-host: LIB_DESTIN_DIR=$(PHL)
139139
install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_)_H_$(CFG_BUILD_))
140140
$(Q)$(call MK_INSTALL_DIR,$(PREFIX_BIN))
141141
$(Q)$(call MK_INSTALL_DIR,$(PREFIX_LIB))
142-
$(Q)$(call MK_INSTALL_DIR,$(CFG_MANDIR/man1)
142+
$(Q)$(call MK_INSTALL_DIR,$(CFG_MANDIR)/man1)
143143
$(Q)$(call INSTALL,$(HB2),$(PHB),rustc$(X_$(CFG_BUILD)))
144144
$(Q)$(call INSTALL,$(HB2),$(PHB),rustpkg$(X_$(CFG_BUILD)))
145145
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X_$(CFG_BUILD)))
@@ -152,9 +152,9 @@ install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_)_H_$(CFG_BUILD_))
152152
$(Q)$(call INSTALL_LIB,$(LIBRUSTDOC_GLOB_$(CFG_BUILD)))
153153
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME_$(CFG_BUILD)))
154154
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM_$(CFG_BUILD)))
155-
$(Q)$(call INSTALL,$(S)/man, $(CFG_MANDIR/man1,rustc.1)
156-
$(Q)$(call INSTALL,$(S)/man, $(CFG_MANDIR/man1,rustdoc.1)
157-
$(Q)$(call INSTALL,$(S)/man, $(CFG_MANDIR/man1,rustpkg.1)
155+
$(Q)$(call INSTALL,$(S)/man, $(CFG_MANDIR)/man1,rustc.1)
156+
$(Q)$(call INSTALL,$(S)/man, $(CFG_MANDIR)/man1,rustdoc.1)
157+
$(Q)$(call INSTALL,$(S)/man, $(CFG_MANDIR)/man1,rustpkg.1)
158158

159159
install-targets: $(INSTALL_TARGET_RULES)
160160

0 commit comments

Comments
 (0)