You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ns...@apache.org on 2012/11/24 18:30:55 UTC
git commit: Fixed the build
Updated Branches:
refs/heads/docs 8e0fd1ef6 -> 726896891
Fixed the build
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/72689689
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/72689689
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/72689689
Branch: refs/heads/docs
Commit: 7268968913592bc4cc1679a258b776f65d9ac392
Parents: 8e0fd1e
Author: Noah Slater <ns...@apache.org>
Authored: Sat Nov 24 17:30:50 2012 +0000
Committer: Noah Slater <ns...@apache.org>
Committed: Sat Nov 24 17:30:50 2012 +0000
----------------------------------------------------------------------
Makefile.am | 2 ++
share/doc/build/Makefile.am | 36 ++++++------------------------------
2 files changed, 8 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/72689689/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 5a700e8..5e83421 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,6 +43,8 @@ EXTRA_DIST = \
NOTICE \
README \
THANKS \
+ build-aux/sphinx-build \
+ build-aux/sphinx-touch \
license.skip
AUTHORS.gz: $(top_srcdir)/AUTHORS
http://git-wip-us.apache.org/repos/asf/couchdb/blob/72689689/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index eb49f1b..cde6bd4 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -55,32 +55,6 @@ html_files = \
html/_images/futon-editeddoc.png \
html/_images/futon-overview.png \
html/_images/futon-replform.png \
- html/_sources/api/authn.rst \
- html/_sources/api/configuration.rst \
- html/_sources/api/database.rst \
- html/_sources/api/dbmaint.rst \
- html/_sources/api/design.rst \
- html/_sources/api/documents.rst \
- html/_sources/api/local.rst \
- html/_sources/api/misc.rst \
- html/_sources/api/reference.rst \
- html/_sources/api-basics.rst \
- html/_sources/changes.rst \
- html/_sources/commonjs.rst \
- html/_sources/config_reference.rst \
- html/_sources/configuring.rst \
- html/_sources/ddocs.rst \
- html/_sources/errors.rst \
- html/_sources/http-proxying.rst \
- html/_sources/index.rst \
- html/_sources/intro.rst \
- html/_sources/json-structure.rst \
- html/_sources/query-servers.rst \
- html/_sources/os-daemons.rst \
- html/_sources/range.rst \
- html/_sources/release.rst \
- html/_sources/replication.rst \
- html/_sources/ssl.rst \
html/_static/ajax-loader.gif \
html/_static/basic.css \
html/_static/comment-bright.png \
@@ -122,9 +96,9 @@ html_files = \
html/index.html \
html/intro.html \
html/json-structure.html \
- html/query-servers.html \
html/objects.inv \
html/os-daemons.html \
+ html/query-servers.html \
html/range.html \
html/release.html \
html/replication.html \
@@ -238,16 +212,18 @@ pdf-local:
html-local:
$(MAKE) $(AM_MAKEFLAGS) html.stamp
+# @@ check AM_UPDATE_INFO_DIR=no
install-data-local:
$(INSTALL) -d $(DESTDIR)$(infodir)
$(INSTALL_DATA) $(info_file) $(DESTDIR)$(infodir)/$(info_name);
- if test -n "`which install-infoBOZ`"; then\
+ if test -n "`which install-info`"; then\
install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$(info_name); \
fi
+# @@ check AM_UPDATE_INFO_DIR=no
uninstall-local:
- rm -f $(infodir)/$(info_name)
- if test -n "`which install-infoBOZ`"; then\
+ rm -f $(DESTDIR)$(infodir)/$(info_name)
+ if test -n "`which install-info`"; then\
install-info --delete --info-dir=$(DESTDIR)$(infodir) $(info_name) ; \
fi
http://git-wip-us.apache.org/repos/asf/couchdb/blob/72689689/share/doc/src/_static/.gitignore
----------------------------------------------------------------------
diff --git a/share/doc/src/_static/.gitignore b/share/doc/src/_static/.gitignore
deleted file mode 100644
index e69de29..0000000