From cbf80f3a68f65be0ed948d68d682762e061ce891 Mon Sep 17 00:00:00 2001 From: Ken Tossell Date: Mon, 15 Dec 2014 17:40:43 -0500 Subject: [PATCH] Only try to install the doc directory if it exists. If you configure with `--disable-docs`, the `doc` directory does not get generated, so `cp -r doc dist/` fails when you `make dist{,-tar-bins,-doc}` or `make install` --- mk/dist.mk | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/mk/dist.mk b/mk/dist.mk index 2db26f819dfdf..bdda15dcc1835 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 -----------------------------------------------