Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C995DD03A for ; Sat, 13 Oct 2012 16:26:02 +0000 (UTC) Received: (qmail 45738 invoked by uid 500); 13 Oct 2012 16:26:02 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 45605 invoked by uid 500); 13 Oct 2012 16:26:02 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 45595 invoked by uid 99); 13 Oct 2012 16:26:02 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 13 Oct 2012 16:26:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4C9F644353; Sat, 13 Oct 2012 16:26:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: nslater@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: Bodging Message-Id: <20121013162602.4C9F644353@tyr.zones.apache.org> Date: Sat, 13 Oct 2012 16:26:02 +0000 (UTC) Updated Branches: refs/heads/docs 5e307b416 -> c45108225 Bodging Underground, overground, I'm bodging free, The Bodger of Wimbledon Common is me. Making good use of the things that I find, Things that the everyday folks leave behind. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c4510822 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c4510822 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c4510822 Branch: refs/heads/docs Commit: c45108225206d14d3dcee9dd0d1713b4fd682f31 Parents: 5e307b4 Author: Noah Slater Authored: Sat Oct 13 17:24:54 2012 +0100 Committer: Noah Slater Committed: Sat Oct 13 17:24:54 2012 +0100 ---------------------------------------------------------------------- .gitignore | 4 +++- share/doc/build/Makefile.am | 15 ++++++++++++--- share/doc/build/texinfo/CouchDB.texi | 3 +++ share/doc/src/conf.py | 2 +- 4 files changed, 19 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/c4510822/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 19344d0..9bcc080 100644 --- a/.gitignore +++ b/.gitignore @@ -41,11 +41,13 @@ etc/init/couchdb etc/launchd/org.apache.couchdb.plist etc/logrotate.d/couchdb libtool +share/doc/build/CouchDB +share/doc/build/CouchDB-* share/doc/build/CouchDB.log share/doc/build/doctrees share/doc/build/html share/doc/build/latex -share/doc/build/texinfo +share/doc/build/texinfo/futon-* share/server/main-coffee.js share/server/main.js src/couch_mrview/ebin/ http://git-wip-us.apache.org/repos/asf/couchdb/blob/c4510822/share/doc/build/Makefile.am ---------------------------------------------------------------------- diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am index a8f267f..56f2818 100644 --- a/share/doc/build/Makefile.am +++ b/share/doc/build/Makefile.am @@ -26,10 +26,10 @@ I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source # ----------------------------------------------------------------------------- -EXTRA_DIST = html/.buildinfo - info_TEXINFOS = texinfo/CouchDB.texi +info_node = texinfo/node.texi + dist_localdoc_DATA = latex/CouchDB.pdf.gz nobase_dist_localdoc_DATA = \ @@ -113,7 +113,16 @@ nobase_dist_localdoc_DATA = \ html/searchindex.js \ html/ssl.html -$(info_TEXINFOS): texinfo +EXTRA_DIST = \ + html/.buildinfo \ + $(info_node) + +# Total bodge. Automake expects Texinfo documents to be hand authored, so there +# is no supported way talk about Texinfo files that need to be built. Instead, +# we're hooking on to a generated target we're not supposed to know about. +$(srcdir)/texinfo/CouchDB: $(info_node) + +$(info_node): texinfo $(dist_localdoc_DATA): pdf http://git-wip-us.apache.org/repos/asf/couchdb/blob/c4510822/share/doc/build/texinfo/CouchDB.texi ---------------------------------------------------------------------- diff --git a/share/doc/build/texinfo/CouchDB.texi b/share/doc/build/texinfo/CouchDB.texi new file mode 100644 index 0000000..eb2a989 --- /dev/null +++ b/share/doc/build/texinfo/CouchDB.texi @@ -0,0 +1,3 @@ +@setfilename CouchDB + +@include texinfo/content.texi http://git-wip-us.apache.org/repos/asf/couchdb/blob/c4510822/share/doc/src/conf.py ---------------------------------------------------------------------- diff --git a/share/doc/src/conf.py b/share/doc/src/conf.py index b0bf6f3..9d58cef 100644 --- a/share/doc/src/conf.py +++ b/share/doc/src/conf.py @@ -61,7 +61,7 @@ latex_documents = [( texinfo_documents = [( "index", - "CouchDB", + "content", "", "", "dir_entry",