couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [46/50] git commit: Bodging
Date Sun, 18 Nov 2012 16:56:24 GMT
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/c157639d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c157639d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c157639d

Branch: refs/heads/docs
Commit: c157639d6917c14542789e70df9624e42881bef5
Parents: 5fbfd48
Author: Noah Slater <nslater@apache.org>
Authored: Sat Oct 13 17:24:54 2012 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Sun Nov 18 00:15:29 2012 +0000

----------------------------------------------------------------------
 .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/c157639d/.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/c157639d/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/c157639d/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/c157639d/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",


Mime
View raw message