From 8f3537f66a59e31ca31a30ba02c5aa1891cc7640 Mon Sep 17 00:00:00 2001 From: Jon Moss Date: Fri, 18 Aug 2017 18:48:45 -0400 Subject: [PATCH] build: allow proper generation of html docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `gen-doc` always calls `gen-json`, which means it's impossible to generate html docs. Changed this to pass in the command the user wants to run. PR-URL: https://github.com/nodejs/node/pull/14932 Fixes: https://github.com/nodejs/node/issues/14930 Reviewed-By: Refael Ackermann Reviewed-By: Tobias Nießen --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5c856e6a2d2657..5b4f6d87f96cd6 100644 --- a/Makefile +++ b/Makefile @@ -503,14 +503,14 @@ gen-doc = \ else \ cd tools/doc && node ../../$(NPM) install; \ fi;\ - [ -x $(NODE) ] && $(NODE) $(gen-json) || node + [ -x $(NODE) ] && $(NODE) $(1) || node $(1) out/doc/api/%.json: doc/api/%.md - $(gen-doc) $(gen-json) + $(call gen-doc, $(gen-json)) # check if ./node is actually set, else use user pre-installed binary out/doc/api/%.html: doc/api/%.md - $(gen-doc) $(gen-html) + $(call gen-doc, $(gen-html)) docopen: $(apidocs_html) @$(PYTHON) -mwebbrowser file://$(PWD)/out/doc/api/all.html