diff options
| author | Jon Moss <me@jonathanmoss.me> | 2017-08-19 01:48:45 +0300 |
|---|---|---|
| committer | Myles Borins <mylesborins@google.com> | 2017-09-12 04:17:04 +0300 |
| commit | 8f3537f66a59e31ca31a30ba02c5aa1891cc7640 (patch) | |
| tree | 0ff1e73b80b5274856428cc1e077751b8bda9e8b /Makefile | |
| parent | 838d3fef72f26bb8734aacc4d885949319f3eb3f (diff) | |
build: allow proper generation of html docs
`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 <refack@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 |