Bad bodge was bad
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/80224f69
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/80224f69
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/80224f69
Branch: refs/heads/docs
Commit: 80224f6941dda1a2a6b66ba3c1d8aba610946b09
Parents: c157639
Author: Noah Slater <nslater@apache.org>
Authored: Sat Oct 13 19:03:22 2012 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Sun Nov 18 00:15:29 2012 +0000
----------------------------------------------------------------------
.gitignore | 4 +---
bootstrap | 13 ++++++++++++-
share/doc/build/Makefile.am | 21 +++++++--------------
share/doc/build/texinfo/CouchDB.texi | 3 ---
share/doc/src/conf.py | 2 +-
5 files changed, 21 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/80224f69/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 9bcc080..19344d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,13 +41,11 @@ 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/futon-*
+share/doc/build/texinfo
share/server/main-coffee.js
share/server/main.js
src/couch_mrview/ebin/
http://git-wip-us.apache.org/repos/asf/couchdb/blob/80224f69/bootstrap
----------------------------------------------------------------------
diff --git a/bootstrap b/bootstrap
index 4af3936..263b249 100755
--- a/bootstrap
+++ b/bootstrap
@@ -80,12 +80,23 @@ AUTOHEADER=`find_program autoheader`
AUTOMAKE=`find_program automake-1.11 automake-1.10 automake-1.9 automake`
AUTOCONF=`find_program autoconf`
+texi_file=share/doc/build/texinfo/CouchDB.texi
+
+if test ! -e $texi_file; then
+ mkdir -p `dirname $texi_file`
+ cat > $texi_file <<EOF
+@setfilename CouchDB
+EOF
+fi
+
${LIBTOOLIZE} -f -c --automake
${ACLOCAL} -I m4
${AUTOHEADER} -f
-${AUTOMAKE} -f -a 2>&1 | sed -e "/install/d"
+${AUTOMAKE} -f -a 2>&1
${AUTOCONF} -f
+# rm -f share/doc/build/texinfo/CouchDB.texi
+
ln -f -s "`dirname \`readlink build-aux/missing\``/INSTALL"
cat << EOF
http://git-wip-us.apache.org/repos/asf/couchdb/blob/80224f69/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index 56f2818..ab1f8f3 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -26,11 +26,9 @@ I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
# -----------------------------------------------------------------------------
-info_TEXINFOS = texinfo/CouchDB.texi
+info_TEXINFOS = texinfo/CouchDB.texi
-info_node = texinfo/node.texi
-
-dist_localdoc_DATA = latex/CouchDB.pdf.gz
+# dist_localdoc_DATA = latex/CouchDB.pdf.gz
nobase_dist_localdoc_DATA = \
html/_images/futon-createdb.png \
@@ -113,16 +111,7 @@ nobase_dist_localdoc_DATA = \
html/searchindex.js \
html/ssl.html
-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
+EXTRA_DIST = html/.buildinfo
$(dist_localdoc_DATA): pdf
@@ -138,6 +127,9 @@ $(nobase_dist_localdoc_DATA): html
# @@ seems to get called twice during the build
# @@ use stamp files, this gets called twice during install too
+$(info_TEXINFOS): texinfo
+
+.PHONY: texinfo
texinfo:
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) texinfo
@@ -180,6 +172,7 @@ maintainer-clean-local:
rm -fr doctrees
rm -fr html
rm -fr latex
+ rm -fr texinfo
# @@ can we remove _static?
http://git-wip-us.apache.org/repos/asf/couchdb/blob/80224f69/share/doc/build/texinfo/CouchDB.texi
----------------------------------------------------------------------
diff --git a/share/doc/build/texinfo/CouchDB.texi b/share/doc/build/texinfo/CouchDB.texi
deleted file mode 100644
index eb2a989..0000000
--- a/share/doc/build/texinfo/CouchDB.texi
+++ /dev/null
@@ -1,3 +0,0 @@
-@setfilename CouchDB
-
-@include texinfo/content.texi
http://git-wip-us.apache.org/repos/asf/couchdb/blob/80224f69/share/doc/src/conf.py
----------------------------------------------------------------------
diff --git a/share/doc/src/conf.py b/share/doc/src/conf.py
index 9d58cef..b0bf6f3 100644
--- a/share/doc/src/conf.py
+++ b/share/doc/src/conf.py
@@ -61,7 +61,7 @@ latex_documents = [(
texinfo_documents = [(
"index",
- "content",
+ "CouchDB",
"",
"",
"dir_entry",
|