# HG changeset patch # User Sylvain Thénault # Date 1287342644 -7200 # Node ID 6c6859a676732c845af69f92e74d4aafae12f83a # Parent 2421875ab88932c02f72e5efb87e063bb646702d [doc] generate doc in cw/doc/html and include html files in cubicweb-documentation diff -r 2421875ab889 -r 6c6859a67673 debian/cubicweb-documentation.install.in --- a/debian/cubicweb-documentation.install.in Sun Oct 17 21:10:01 2010 +0200 +++ b/debian/cubicweb-documentation.install.in Sun Oct 17 21:10:44 2010 +0200 @@ -1,2 +1,3 @@ doc/book usr/share/doc/cubicweb-documentation +doc/html usr/share/doc/cubicweb-documentation debian/cubicweb-doc usr/share/doc-base/cubicweb-doc diff -r 2421875ab889 -r 6c6859a67673 doc/book/en/makefile --- a/doc/book/en/makefile Sun Oct 17 21:10:01 2010 +0200 +++ b/doc/book/en/makefile Sun Oct 17 21:10:44 2010 +0200 @@ -10,7 +10,7 @@ SPHINXBUILD = sphinx-build PAPER = #BUILDDIR = build -BUILDDIR = ~/tmp/cwdoc +BUILDDIR = ../../html CWDIR = ../../.. JSDIR = ${CWDIR}/web/data JSTORST = ${CWDIR}/doc/tools/pyjsrest.py