Drizzle Client & Protocol Library

Merge lp:~brianaker/libdrizzle/install-html-fix into lp:libdrizzle

  1. install-html-fix
  2. Merge into libdrizzle-redux
Proposed by Brian Aker
Status: Merged
Approved by: Andrew Hutchings
Approved revision: 76
Merged at revision: 76
Proposed branch: lp:~brianaker/libdrizzle/install-html-fix
Merge into: lp:libdrizzle
Diff against target: 100 lines (+10/-44)
1 file modified
docs/include.am (+10/-44)
To merge this branch: bzr merge lp:~brianaker/libdrizzle/install-html-fix
Reviewer Review Type Date Requested Status
Drizzle Trunk Pending
Review via email: mp+141586@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'docs/include.am'
2--- docs/include.am 2012-12-18 21:54:49 +0000
3+++ docs/include.am 2013-01-02 07:53:21 +0000
4@@ -24,7 +24,6 @@
5 sphinx-help:
6 @echo "Please use \`make <target>' where <target> is one of"
7 @echo " html to make standalone HTML files"
8- @echo " dirhtml to make HTML files named index.html in directories"
9 @echo " singlehtml to make a single large HTML file"
10 @echo " pickle to make pickle files"
11 @echo " json to make JSON files"
12@@ -40,23 +39,15 @@
13 @echo " linkcheck to check all external links for integrity"
14 @echo " doctest to run all doctests embedded in the documentation (if enabled)"
15
16-doc_dirs:
17- @$(mkdir_p) $(SPHINX_BUILDDIR)/_static
18-
19-html-local: docs/conf.py docs changes doc_dirs
20- PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/html
21- @echo
22- @echo "Build finished. The HTML pages are in $(SPHINX_BUILDDIR)/html."
23-
24-dirhtml: html-local
25- PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/dirhtml
26- @echo
27- @echo "Build finished. The HTML pages are in $(SPHINX_BUILDDIR)/dirhtml."
28+install-html-local: html-local
29+ @$(MKDIR_P) $(htmldir)/html
30+ @cp -r ${top_builddir}/html $(htmldir)/
31+
32+html-local: docs/conf.py
33+ @PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) ${top_builddir}/html
34
35 singlehtml: html-local
36- PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/singlehtml
37- @echo
38- @echo "Build finished. The HTML page is in $(SPHINX_BUILDDIR)/singlehtml."
39+ @PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/singlehtml
40
41 pickle: docs/conf.py
42 PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/pickle
43@@ -74,24 +65,6 @@
44 @echo "Build finished; now you can run HTML Help Workshop with the" \
45 ".hhp project file in $(SPHINX_BUILDDIR)/htmlhelp."
46
47-qthelp: docs/conf.py
48- PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/qthelp
49- @echo
50- @echo "Build finished; now you can run "qcollectiongenerator" with the" \
51- ".qhcp project file in $(SPHINX_BUILDDIR)/qthelp, like this:"
52- @echo "# qcollectiongenerator $(SPHINX_BUILDDIR)/qthelp/Libmemcached.qhcp"
53- @echo "To view the help file:"
54- @echo "# assistant -collectionFile $(SPHINX_BUILDDIR)/qthelp/Libmemcached.qhc"
55-
56-devhelp: docs/conf.py
57- PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/devhelp
58- @echo
59- @echo "Build finished."
60- @echo "To view the help file:"
61- @echo "# mkdir -p $$HOME/.local/share/devhelp/Libmemcached"
62- @echo "# ln -s $(SPHINX_BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Libmemcached"
63- @echo "# devhelp"
64-
65 epub: docs/conf.py
66 PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/epub
67 @echo
68@@ -111,13 +84,11 @@
69 @echo "pdflatex finished; the PDF files are in $(SPHINX_BUILDDIR)/latex."
70
71 text: docs/conf.py
72- PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/text
73- @echo
74- @echo "Build finished. The text files are in $(SPHINX_BUILDDIR)/text."
75+ @PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/text
76
77 if HAVE_RECENT_SPHINX
78 man:
79- PYTHONPATH=$(SPHINX_BUILDDIR)/docs $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) ${top_builddir}/man
80+ @PYTHONPATH=$(SPHINX_BUILDDIR)/docs $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) ${top_builddir}/man
81
82 else
83
84@@ -126,15 +97,10 @@
85 endif
86
87 changes: docs/conf.py
88- PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/changes
89- @echo
90- @echo "The overview file is in $(SPHINX_BUILDDIR)/changes."
91+ @PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/changes
92
93 linkcheck: docs/conf.py
94 PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/linkcheck
95- @echo
96- @echo "Link check complete; look for any errors in the above output " \
97- "or in $(SPHINX_BUILDDIR)/linkcheck/output.txt."
98
99 doctest: docs/conf.py
100 PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/doctest

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: