You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2012/11/18 17:49:46 UTC
[30/50] git commit: Got the build working again, yay
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/1664a23f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1664a23f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1664a23f
Branch: refs/heads/docs_tmp
Commit: 1664a23fe361cfb9ca3ba422e40902cee6a6b115
Parents: e03f1a8
Author: Noah Slater <ns...@apache.org>
Authored: Sun Oct 14 03:24:45 2012 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Sun Nov 18 00:15:31 2012 +0000
----------------------------------------------------------------------
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/1664a23f/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/1664a23f/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/1664a23f/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",