Merge branch 't/18012/sphinx_depends_on_jinja2' into categories/finit…

…ely-generated-magmas-17160
sagemath · Mar 21, 2015 · ef01ef0 · ef01ef0
2 parents 919a215 + 5e6c707
commit ef01ef0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/build/deps b/build/deps
@@ -471,7 +471,7 @@ $(INST)/$(SPHINX): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS) $(INST)/$(DOCUTILS) \
 $(INST)/$(MARKUPSAFE): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
 	+$(PIPE) "$(SAGE_SPKG) $(MARKUPSAFE) 2>&1" "tee -a $(SAGE_LOGS)/$(MARKUPSAFE).log"
 
-$(INST)/$(JINJA2): $(INST)/$(MARKUPSAFE) $(INST)/$(SPHINX)
+$(INST)/$(JINJA2): $(INST)/$(MARKUPSAFE)  $(INST)/$(SETUPTOOLS) $(INST)/$(DOCUTILS)
 	+$(PIPE) "$(SAGE_SPKG) $(JINJA2) 2>&1" "tee -a $(SAGE_LOGS)/$(JINJA2).log"
 
 $(INST)/$(PYGMENTS): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)

diff --git a/build/pkgs/jinja2/spkg-install b/build/pkgs/jinja2/spkg-install
@@ -23,3 +23,5 @@ cd src
 python setup.py install
 success 'Error installing Jinja2'
 
+### The Jinja2 docs use Sphinx which requires Jinja2... do not build!
+# make -C docs html