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
=== modified file 'docs/include.am'
--- docs/include.am 2012-12-18 21:54:49 +0000
+++ docs/include.am 2013-01-02 07:53:21 +0000
@@ -24,7 +24,6 @@
24sphinx-help:24sphinx-help:
25 @echo "Please use \`make <target>' where <target> is one of"25 @echo "Please use \`make <target>' where <target> is one of"
26 @echo " html to make standalone HTML files"26 @echo " html to make standalone HTML files"
27 @echo " dirhtml to make HTML files named index.html in directories"
28 @echo " singlehtml to make a single large HTML file"27 @echo " singlehtml to make a single large HTML file"
29 @echo " pickle to make pickle files"28 @echo " pickle to make pickle files"
30 @echo " json to make JSON files"29 @echo " json to make JSON files"
@@ -40,23 +39,15 @@
40 @echo " linkcheck to check all external links for integrity"39 @echo " linkcheck to check all external links for integrity"
41 @echo " doctest to run all doctests embedded in the documentation (if enabled)"40 @echo " doctest to run all doctests embedded in the documentation (if enabled)"
4241
43doc_dirs: 42install-html-local: html-local
44 @$(mkdir_p) $(SPHINX_BUILDDIR)/_static43 @$(MKDIR_P) $(htmldir)/html
4544 @cp -r ${top_builddir}/html $(htmldir)/
46html-local: docs/conf.py docs changes doc_dirs45
47 PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/html46html-local: docs/conf.py
48 @echo47 @PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) ${top_builddir}/html
49 @echo "Build finished. The HTML pages are in $(SPHINX_BUILDDIR)/html."
50
51dirhtml: html-local
52 PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/dirhtml
53 @echo
54 @echo "Build finished. The HTML pages are in $(SPHINX_BUILDDIR)/dirhtml."
5548
56singlehtml: html-local49singlehtml: html-local
57 PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/singlehtml50 @PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/singlehtml
58 @echo
59 @echo "Build finished. The HTML page is in $(SPHINX_BUILDDIR)/singlehtml."
6051
61pickle: docs/conf.py52pickle: docs/conf.py
62 PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/pickle53 PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/pickle
@@ -74,24 +65,6 @@
74 @echo "Build finished; now you can run HTML Help Workshop with the" \65 @echo "Build finished; now you can run HTML Help Workshop with the" \
75 ".hhp project file in $(SPHINX_BUILDDIR)/htmlhelp."66 ".hhp project file in $(SPHINX_BUILDDIR)/htmlhelp."
7667
77qthelp: docs/conf.py
78 PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/qthelp
79 @echo
80 @echo "Build finished; now you can run "qcollectiongenerator" with the" \
81 ".qhcp project file in $(SPHINX_BUILDDIR)/qthelp, like this:"
82 @echo "# qcollectiongenerator $(SPHINX_BUILDDIR)/qthelp/Libmemcached.qhcp"
83 @echo "To view the help file:"
84 @echo "# assistant -collectionFile $(SPHINX_BUILDDIR)/qthelp/Libmemcached.qhc"
85
86devhelp: docs/conf.py
87 PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/devhelp
88 @echo
89 @echo "Build finished."
90 @echo "To view the help file:"
91 @echo "# mkdir -p $$HOME/.local/share/devhelp/Libmemcached"
92 @echo "# ln -s $(SPHINX_BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Libmemcached"
93 @echo "# devhelp"
94
95epub: docs/conf.py68epub: docs/conf.py
96 PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/epub69 PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/epub
97 @echo70 @echo
@@ -111,13 +84,11 @@
111 @echo "pdflatex finished; the PDF files are in $(SPHINX_BUILDDIR)/latex."84 @echo "pdflatex finished; the PDF files are in $(SPHINX_BUILDDIR)/latex."
11285
113text: docs/conf.py86text: docs/conf.py
114 PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/text87 @PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/text
115 @echo
116 @echo "Build finished. The text files are in $(SPHINX_BUILDDIR)/text."
11788
118if HAVE_RECENT_SPHINX89if HAVE_RECENT_SPHINX
119man:90man:
120 PYTHONPATH=$(SPHINX_BUILDDIR)/docs $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) ${top_builddir}/man91 @PYTHONPATH=$(SPHINX_BUILDDIR)/docs $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) ${top_builddir}/man
12192
122else93else
12394
@@ -126,15 +97,10 @@
126endif97endif
12798
128changes: docs/conf.py99changes: docs/conf.py
129 PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/changes100 @PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/changes
130 @echo
131 @echo "The overview file is in $(SPHINX_BUILDDIR)/changes."
132101
133linkcheck: docs/conf.py102linkcheck: docs/conf.py
134 PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/linkcheck103 PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/linkcheck
135 @echo
136 @echo "Link check complete; look for any errors in the above output " \
137 "or in $(SPHINX_BUILDDIR)/linkcheck/output.txt."
138104
139doctest: docs/conf.py105doctest: docs/conf.py
140 PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/doctest106 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: