From cd051c4a0ddae204fd22406c69c703fdf6def880 Mon Sep 17 00:00:00 2001 From: Maykel Moya Date: Tue, 15 Oct 2013 16:21:19 +0200 Subject: [PATCH] Fix building of docsite * Fix paths in docsite/Makefile having an additional '..'. * Ignore generated docsite/rst/modules/*.rst --- docsite/.gitignore | 1 + docsite/Makefile | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docsite/.gitignore b/docsite/.gitignore index efa7555c55..7b47a7f7fd 100644 --- a/docsite/.gitignore +++ b/docsite/.gitignore @@ -11,3 +11,4 @@ ansible*.xml .buildinfo objects.inv .doctrees +rst/modules/*.rst diff --git a/docsite/Makefile b/docsite/Makefile index 8f480bfd03..56b84fbc88 100644 --- a/docsite/Makefile +++ b/docsite/Makefile @@ -1,6 +1,6 @@ #!/usr/bin/make SITELIB = $(shell python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") -FORMATTER=../../hacking/module_formatter.py +FORMATTER=../hacking/module_formatter.py all: clean docs @@ -26,7 +26,7 @@ clean: .PHONEY: docs clean -modules: $(FORMATTER) ../../hacking/templates/rst.j2 - PYTHONPATH=../../lib $(FORMATTER) -t rst --template-dir=../../hacking/templates --module-dir=../../library -o rst/modules/ --includes-file=rst/modules/_list.rst +modules: $(FORMATTER) ../hacking/templates/rst.j2 + PYTHONPATH=../lib $(FORMATTER) -t rst --template-dir=../hacking/templates --module-dir=../library -o rst/modules/ --includes-file=rst/modules/_list.rst