← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to docs/include.am

  • Committer: lbieber
  • Date: 2010-09-27 15:28:22 UTC
  • mfrom: (1796.1.3 build)
  • Revision ID: lbieber@orisndriz08-20100927152822-ultcy4cfojqlihqz
Merge Vijay - fix bug 585982 - Default datadir and pid-file location reported by --help were incorrect
Merge Monty - fix bug 648360 - Fix a few small things in the sphinx doc build. Adds some initial docs for program options loading.
Merge Lee - fix bug 621304 - Fix filesystem_engine.multiple_update test failure on OSX 

Show diffs side-by-side

added added

removed removed

Lines of Context:
docs/include.am
5
5
EXTRA_DIST+= \
6
6
             docs/_static \
7
7
             docs/_templates \
 
8
             docs/api_header.html \
8
9
             docs/conf.py \
 
10
             docs/Doxyfile.api \
 
11
             docs/Doxyfile.dev \
 
12
             docs/Doxyfile.drizzled \
 
13
             docs/dev_header.html \
 
14
             docs/doxygen.h \
9
15
             docs/drizzled_header.html \
10
 
             docs/index.rst
 
16
             ${top_srcdir}/docs/*.rst \
 
17
             ${top_srcdir}/docs/clients/*.rst
 
18
 
11
19
 
12
20
# Makefile for Sphinx documentation
13
21
#
14
22
 
15
 
SPHINXOPTS    =
 
23
SPHINXOPTS    = -D release=${PANDORA_RELEASE_VERSION}
16
24
PAPER         =
17
25
SPHINX_BUILDDIR      = ${top_builddir}/docs
18
26