Skip to content

Commit 99d6956

Browse files
committed
auto merge of #19896 : ktossell/rust/allow-nodoc-install, r=alexcrichton
If you configure with `--disable-docs`, the `doc` directory does not get generated, so the `cp -r doc dist/` step fails when you `make dist{,-tar-bins,-doc}` or `make install`.
2 parents f9a4849 + cbf80f3 commit 99d6956

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

mk/dist.mk

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ dist-install-dir-$(1): prepare-base-dir-$(1) docs compiler-docs
229229
$$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-APACHE $$(PREPARE_DEST_DIR)
230230
$$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-MIT $$(PREPARE_DEST_DIR)
231231
$$(Q)$$(PREPARE_MAN_CMD) $$(S)README.md $$(PREPARE_DEST_DIR)
232-
$$(Q)cp -r doc $$(PREPARE_DEST_DIR)
232+
$$(Q)[ ! -d doc ] || cp -r doc $$(PREPARE_DEST_DIR)
233233

234234
dist/$$(PKG_NAME)-$(1).tar.gz: dist-install-dir-$(1)
235235
@$(call E, build: $$@)
@@ -312,9 +312,17 @@ MAYBE_DIST_TAR_SRC=dist-tar-src
312312
MAYBE_DISTCHECK_TAR_SRC=distcheck-tar-src
313313
endif
314314

315-
dist: $(MAYBE_DIST_TAR_SRC) dist-osx dist-tar-bins dist-docs
315+
ifneq ($(CFG_DISABLE_DOCS),)
316+
MAYBE_DIST_DOCS=
317+
MAYBE_DISTCHECK_DOCS=
318+
else
319+
MAYBE_DIST_DOCS=dist-docs
320+
MAYBE_DISTCHECK_DOCS=distcheck-docs
321+
endif
322+
323+
dist: $(MAYBE_DIST_TAR_SRC) dist-osx dist-tar-bins $(MAYBE_DIST_DOCS)
316324

317-
distcheck: $(MAYBE_DISTCHECK_TAR_SRC) distcheck-osx distcheck-tar-bins distcheck-docs
325+
distcheck: $(MAYBE_DISTCHECK_TAR_SRC) distcheck-osx distcheck-tar-bins $(MAYBE_DISTCHECK_DOCS)
318326
$(Q)rm -Rf tmp/distcheck
319327
@echo
320328
@echo -----------------------------------------------

0 commit comments

Comments
 (0)