Skip to content

Commit

Permalink
doc: use submodule for JuliaDoc instead of package
Browse files Browse the repository at this point in the history
The JuliaDoc package seems to be giving some people trouble due to
pip being unavailable, so pull it in as a submodule instead.
  • Loading branch information
pao committed Jun 19, 2013
1 parent d12fb43 commit f7dc38d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions doc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions doc/juliadoc
Submodule juliadoc added at 0ea2c9

0 comments on commit f7dc38d

Please sign in to comment.