diff options
| author | Graydon Hoare <graydon@mozilla.com> | 2012-01-17 14:46:42 -0800 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2012-01-17 14:46:51 -0800 |
| commit | af4e18d980725a2f3a6324b1f9a16c19222e17fd (patch) | |
| tree | 42156affcdb1a3d5fd545ce5a2a77b25fb2a7566 | |
| parent | b4fc99e09e5ef907b1de80919764852211fdc10c (diff) | |
Improve the node-doc-building logic.
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | mk/docs.mk | 19 |
2 files changed, 10 insertions, 14 deletions
diff --git a/configure b/configure index 5dbfeadc618..4009bd2c58a 100755 --- a/configure +++ b/configure @@ -291,6 +291,11 @@ probe CFG_PANDOC pandoc probe CFG_PDFLATEX pdflatex probe CFG_NODE node +if [ -z "$CFG_NODE" ] +then + probe CFG_NODE nodejs +fi + if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ] then err "either clang or gcc is required" diff --git a/mk/docs.mk b/mk/docs.mk index faf51d88885..e69cb464e74 100644 --- a/mk/docs.mk +++ b/mk/docs.mk @@ -44,20 +44,11 @@ endif ifdef CFG_NODE -doc/tutorial/web/index.html: doc/tutorial/args.md \ - doc/tutorial/control.md \ - doc/tutorial/data.md \ - doc/tutorial/ffi.md \ - doc/tutorial/func.md \ - doc/tutorial/generic.md \ - doc/tutorial/iface.md \ - doc/tutorial/index.md \ - doc/tutorial/intro.md \ - doc/tutorial/mod.md \ - doc/tutorial/setup.md \ - doc/tutorial/syntax.md \ - doc/tutorial/task.md \ - doc/tutorial/test.md +doc/tutorial/web/index.html: \ + $(wildcard $(S)doc/tutorial/*.md) + @$(call E, cp: $@) + $(Q)cp -arv $(S)doc/tutorial doc/ + @$(call E, node: build.js) $(Q)cd doc/tutorial && $(CFG_NODE) build.js endif |