tools: try installing js-yaml only once

joyeecheung · gibfahn · commit 962fd757add4 · 2017-12-19T20:09:43.000Z
PR-URL: #16661 Fixes: #16650 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com>
diff --git a/Makefile b/Makefile
@@ -544,7 +544,8 @@ apidoc_dirs = out/doc out/doc/api/ out/doc/api/assets
 
 apiassets = $(subst api_assets,api/assets,$(addprefix out/,$(wildcard doc/api_assets/*)))
 
-doc-only: $(apidocs_html) $(apidocs_json)
+doc-targets: $(apidocs_html) $(apidocs_json)
+doc-only: | install-yaml doc-targets
 doc: $(NODE_EXE) doc-only
 
 $(apidoc_dirs):
@@ -561,15 +562,16 @@ gen-json = tools/doc/generate.js --format=json $< > $@
 gen-html = tools/doc/generate.js --node-version=$(FULLVERSION) --format=html \
 			--template=doc/template.html --analytics=$(DOCS_ANALYTICS) $< > $@
 
-gen-doc =	\
+install-yaml:
 	[ -e tools/doc/node_modules/js-yaml/package.json ] || \
 		[ -e tools/eslint/node_modules/js-yaml/package.json ] || \
 		if [ -x $(NODE) ]; then \
 			cd tools/doc && ../../$(NODE) ../../$(NPM) install; \
 		else \
 			cd tools/doc && node ../../$(NPM) install; \
-		fi;\
-	[ -x $(NODE) ] && $(NODE) $(1) || node $(1)
+		fi;
+
+gen-doc = [ -x $(NODE) ] && $(NODE) $(1) || node $(1)
 
 out/doc/api/%.json: doc/api/%.md
 	@$(call gen-doc, $(gen-json))
@@ -1155,6 +1157,7 @@ lint-clean:
   install \
   install-bin \
   install-includes \
+  install-yaml \
   lint \
   lint-clean \
   lint-ci \
