Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/npm/cli.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorisaacs <i@izs.me>2011-10-04 05:47:53 +0400
committerisaacs <i@izs.me>2011-10-04 05:47:53 +0400
commitb337aced94f3e7d8c0de148e3bbb77f73020c23d (patch)
tree5eefec215ad516d70e3b375dc5ecbd4d4acaa578 /Makefile
parentbd0c73dbbe9dbe11ff2f75fb7ef11c7431a59ab9 (diff)
Update 'make doc' to only ronn build if necessary
Also, updated to play nicely with 'make -j8 doc'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 136d0dc39..98881a692 100644
--- a/Makefile
+++ b/Makefile
@@ -53,12 +53,14 @@ clean: doc-clean uninstall
uninstall: submodules
node cli.js rm npm -g -f
-doc: node_modules/ronn $(mandocs) $(htmldocs)
+doc: $(mandocs) $(htmldocs)
docclean: doc-clean
doc-clean:
rm -rf \
node_modules/ronn \
+ node_modules/.bin/ronn \
+ .building_ronn \
doc/cli/index.md \
doc/api/index.md \
$(api_mandocs) \
@@ -67,9 +69,6 @@ doc-clean:
$(cli_htmldocs) \
&>/dev/null || true
-node_modules/ronn:
- node cli.js install git+https://github.com/isaacs/ronnjs.git
-
# use `npm install ronn` for this to work.
man/man1/README.1: README.md scripts/doc-build.sh package.json
scripts/doc-build.sh $< $@
@@ -94,6 +93,9 @@ html/api/%.html: doc/api/%.md html/dochead.html html/docfoot.html scripts/doc-bu
doc/cli/index.md: $(markdowns) scripts/index-build.js scripts/doc-build.sh package.json
node scripts/index-build.js > $@
+node_modules/ronn:
+ node cli.js install https://github.com/isaacs/ronnjs/tarball/master
+
doc: man
man: $(cli_docs) $(api_docs)