Skip to content

Commit 5e21e17

Browse files
committed
auto merge of #20437 : ranma42/rust/fix-make-install, r=alexcrichton
After 8b3c676 the `make install` command fails if docs are not disabled through CFG_DISABLE_DOCS, because now the `install` target uses ../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh Instead of explicitly depending on dist/$(PKG_NAME)-$(CFG_BUILD).tar.gz, the `prepare_[un]install` targets now depend on `dist-tar-bins`, which packages the appropriate dist archives depending on the configuration.
2 parents 856b90c + f2ee9fc commit 5e21e17

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

mk/install.mk

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,7 @@ endif
2828
# Remove tmp files because it's a decent amount of disk space
2929
$(Q)rm -R tmp/dist
3030

31-
ifeq ($(CFG_DISABLE_DOCS),)
32-
prepare_install: dist/$(PKG_NAME)-$(CFG_BUILD).tar.gz dist/$(DOC_PKG_NAME)-$(CFG_BUILD).tar.gz | tmp/empty_dir
33-
else
34-
prepare_install: dist/$(PKG_NAME)-$(CFG_BUILD).tar.gz | tmp/empty_dir
35-
endif
31+
prepare_install: dist-tar-bins | tmp/empty_dir
3632

3733
uninstall:
3834
ifeq (root user, $(USER) $(patsubst %,user,$(SUDO_USER)))
@@ -48,7 +44,7 @@ endif
4844
# Remove tmp files because it's a decent amount of disk space
4945
$(Q)rm -R tmp/dist
5046

51-
prepare_uninstall: dist/$(PKG_NAME)-$(CFG_BUILD).tar.gz | tmp/empty_dir
47+
prepare_uninstall: dist-tar-bins | tmp/empty_dir
5248

5349
.PHONY: install prepare_install uninstall prepare_uninstall
5450

0 commit comments

Comments
 (0)