diff options
| author | bors <bors@rust-lang.org> | 2014-12-18 20:32:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-12-18 20:32:07 +0000 |
| commit | 99d6956c3bdb290b9fd539c5dc15a2b502da5e7a (patch) | |
| tree | 28ad4497f0555ad99282ce79430057ccddae8bf1 | |
| parent | f9a48492a82f805aa40d8b6fea290badbab0d1b1 (diff) | |
| parent | cbf80f3a68f65be0ed948d68d682762e061ce891 (diff) | |
| download | rust-99d6956c3bdb290b9fd539c5dc15a2b502da5e7a.tar.gz rust-99d6956c3bdb290b9fd539c5dc15a2b502da5e7a.zip | |
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`.
| -rw-r--r-- | mk/dist.mk | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/mk/dist.mk b/mk/dist.mk index 2db26f819df..bdda15dcc18 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -229,7 +229,7 @@ dist-install-dir-$(1): prepare-base-dir-$(1) docs compiler-docs $$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-APACHE $$(PREPARE_DEST_DIR) $$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-MIT $$(PREPARE_DEST_DIR) $$(Q)$$(PREPARE_MAN_CMD) $$(S)README.md $$(PREPARE_DEST_DIR) - $$(Q)cp -r doc $$(PREPARE_DEST_DIR) + $$(Q)[ ! -d doc ] || cp -r doc $$(PREPARE_DEST_DIR) dist/$$(PKG_NAME)-$(1).tar.gz: dist-install-dir-$(1) @$(call E, build: $$@) @@ -312,9 +312,17 @@ MAYBE_DIST_TAR_SRC=dist-tar-src MAYBE_DISTCHECK_TAR_SRC=distcheck-tar-src endif -dist: $(MAYBE_DIST_TAR_SRC) dist-osx dist-tar-bins dist-docs +ifneq ($(CFG_DISABLE_DOCS),) +MAYBE_DIST_DOCS= +MAYBE_DISTCHECK_DOCS= +else +MAYBE_DIST_DOCS=dist-docs +MAYBE_DISTCHECK_DOCS=distcheck-docs +endif + +dist: $(MAYBE_DIST_TAR_SRC) dist-osx dist-tar-bins $(MAYBE_DIST_DOCS) -distcheck: $(MAYBE_DISTCHECK_TAR_SRC) distcheck-osx distcheck-tar-bins distcheck-docs +distcheck: $(MAYBE_DISTCHECK_TAR_SRC) distcheck-osx distcheck-tar-bins $(MAYBE_DISTCHECK_DOCS) $(Q)rm -Rf tmp/distcheck @echo @echo ----------------------------------------------- |