Updated Branches:
  refs/heads/docs d9e779461 -> c6503c540


Got the build working again, yay


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c6503c54
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c6503c54
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c6503c54

Branch: refs/heads/docs
Commit: c6503c54042fa2c8fece25d9dfd2c87a96df4466
Parents: d9e7794
Author: Noah Slater <nslater@apache.org>
Authored: Sun Oct 14 03:24:45 2012 +0100
Committer: Noah Slater <nslater@apache.org>
Committed: Sun Oct 14 03:24:45 2012 +0100

----------------------------------------------------------------------
 bootstrap                   |   10 ++++++++++
 share/doc/build/Makefile.am |    3 +--
 share/doc/conf.py           |    4 ++++
 3 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/c6503c54/bootstrap
----------------------------------------------------------------------
diff --git a/bootstrap b/bootstrap
index ab3b9f4..e9f824e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -112,12 +112,22 @@ fi
 mkdir -p build-aux
 mkdir -p m4
 
+texi_file="share/doc/build/texinfo/CouchDB.texi"
+
+mkdir -p `dirname $texi_file`
+
+cat > $texi_file << EOF
+@setfilename CouchDB
+EOF
+
 ${LIBTOOLIZE} -f -c --automake
 ${ACLOCAL} -I m4 -Wall
 ${AUTOHEADER} -f
 ${AUTOMAKE} -f -a -Wall
 ${AUTOCONF} -f -Wall
 
+rm -f $texi_file 
+
 rm -f INSTALL
 
 ln -f -s "`dirname \`readlink build-aux/missing\``/INSTALL"

http://git-wip-us.apache.org/repos/asf/couchdb/blob/c6503c54/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index 94832e3..9ba2f4c 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -38,7 +38,6 @@ SPHINX_BUILD = sphinx-build
 
 SPHINXOPTS = \
     -d doctrees \
-    -D latex_paper_size=a4 \
     -n -c $(srcdir)/.. \
     $(srcdir)/../src
 
@@ -192,7 +191,7 @@ $(texinfo_files): texinfo.stamp
 texinfo.stamp: $(image_files) $(src_files)
 	@rm -f texinfo.tmp
 	@touch texinfo.tmp
-	$(SPHINX_UILD) -b texinfo $(SPHINXOPTS) $(builddir)/texinfo
+	$(SPHINX_BUILD) -b texinfo $(SPHINXOPTS) $(builddir)/texinfo
 	@mv -f texinfo.tmp $@
 
 $(pdf_files): pdf.stamp

http://git-wip-us.apache.org/repos/asf/couchdb/blob/c6503c54/share/doc/conf.py
----------------------------------------------------------------------
diff --git a/share/doc/conf.py b/share/doc/conf.py
index ac8e0c7..8602ab9 100644
--- a/share/doc/conf.py
+++ b/share/doc/conf.py
@@ -59,6 +59,10 @@ latex_documents = [(
 	True
 )]
 
+#latex_elements[(
+#	"a4paper" # @@ do we want this?
+#)]
+
 texinfo_documents = [(
 	"index",
 	"CouchDB",