Merge branch 'topic/doc-submodule'

tknopp · Jun 19, 2013 · f1427a6 · f1427a6
2 parents 580d9b0 + f7dc38d
commit f1427a6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "deps/Rmath"]
  path = deps/Rmath
  url = git:https://github.com/JuliaLang/Rmath.git
+[submodule "doc/juliadoc"]
+ path = doc/juliadoc
+ url = git:https://github.com/JuliaLang/JuliaDoc.git
diff --git a/doc/Makefile b/doc/Makefile
@@ -3,7 +3,7 @@
 
 # You can set these variables from the command line.
 SPHINXOPTS =
-SPHINXBUILD = sphinx-build
+SPHINXBUILD = PYTHONPATH=$(PYTHONPATH):juliadoc sphinx-build
 PAPER =
 BUILDDIR = _build
 JULIA = ../julia
@@ -45,8 +45,8 @@ help:
 clean:
  -rm -rf $(BUILDDIR)/*
 
-juliadoc-pkg:
- pip install --user --upgrade -r requirements.txt
+juliadoc-pkg: juliadoc/juliadoc/__init__.py
+ @-cd .. && git submodule update doc/juliadoc
 
 html: juliadoc-pkg
  $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html

diff --git a/doc/juliadoc b/doc/juliadoc