Commit 7fe6a8f
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -539,7 +539,8 @@ apidoc_dirs = out/doc out/doc/api/ out/doc/api/assets | |||
| 539 | 539 | ||
| 540 | 540 | apiassets = $(subst api_assets,api/assets,$(addprefix out/,$(wildcard doc/api_assets/*))) | |
| 541 | 541 | ||
| 542 | - doc-only: $(apidocs_html) $(apidocs_json) | ||
| 542 | + doc-targets: $(apidocs_html) $(apidocs_json) | ||
| 543 | + doc-only: | install-yaml doc-targets | ||
| 543 | 544 | doc: $(NODE_EXE) doc-only | |
| 544 | 545 | ||
| 545 | 546 | $(apidoc_dirs): | |
@@ -556,15 +557,16 @@ gen-json = tools/doc/generate.js --format=json $< > $@ | |||
| 556 | 557 | gen-html = tools/doc/generate.js --node-version=$(FULLVERSION) --format=html \ | |
| 557 | 558 | --template=doc/template.html --analytics=$(DOCS_ANALYTICS) $< > $@ | |
| 558 | 559 | ||
| 559 | - gen-doc = \ | ||
| 560 | + install-yaml: | ||
| 560 | 561 | [ -e tools/doc/node_modules/js-yaml/package.json ] || \ | |
| 561 | 562 | [ -e tools/eslint/node_modules/js-yaml/package.json ] || \ | |
| 562 | 563 | if [ -x $(NODE) ]; then \ | |
| 563 | 564 | cd tools/doc && ../../$(NODE) ../../$(NPM) install; \ | |
| 564 | 565 | else \ | |
| 565 | 566 | cd tools/doc && node ../../$(NPM) install; \ | |
| 566 | - fi;\ | ||
| 567 | - [ -x $(NODE) ] && $(NODE) $(1) || node $(1) | ||
| 567 | + fi; | ||
| 568 | + | ||
| 569 | + gen-doc = [ -x $(NODE) ] && $(NODE) $(1) || node $(1) | ||
| 568 | 570 | ||
| 569 | 571 | out/doc/api/%.json: doc/api/%.md | |
| 570 | 572 | @$(call gen-doc, $(gen-json)) | |
@@ -1150,6 +1152,7 @@ lint-clean: | |||
| 1150 | 1152 | install \ | |
| 1151 | 1153 | install-bin \ | |
| 1152 | 1154 | install-includes \ | |
| 1155 | + install-yaml \ | ||
| 1153 | 1156 | lint \ | |
| 1154 | 1157 | lint-clean \ | |
| 1155 | 1158 | lint-ci \ | |
0 commit comments