couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [48/50] git commit: Got basic build working, loads more to do
Date Sun, 18 Nov 2012 16:56:24 GMT
Got basic build working, loads more to do


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/78a9eb3e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/78a9eb3e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/78a9eb3e

Branch: refs/heads/docs
Commit: 78a9eb3e0b5d057f95acc69b7cd8421e79b50a1c
Parents: ef64457
Author: Noah Slater <nslater@apache.org>
Authored: Sat Oct 6 17:26:40 2012 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Sun Nov 18 00:15:29 2012 +0000

----------------------------------------------------------------------
 .gitignore                  |    1 +
 share/doc/build/Makefile.am |   24 ++++++++++--------------
 2 files changed, 11 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/78a9eb3e/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index a899d58..19344d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@ etc/init/couchdb
 etc/launchd/org.apache.couchdb.plist
 etc/logrotate.d/couchdb
 libtool
+share/doc/build/CouchDB.log
 share/doc/build/doctrees
 share/doc/build/html
 share/doc/build/latex

http://git-wip-us.apache.org/repos/asf/couchdb/blob/78a9eb3e/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index cea525e..a8f267f 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -26,10 +26,9 @@ I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
 
 # -----------------------------------------------------------------------------
 
-EXTRA_DIST = \
-    html/.buildinfo
+EXTRA_DIST = html/.buildinfo
 
-info_DATA = texinfo/CouchDB.info
+info_TEXINFOS = texinfo/CouchDB.texi
 
 dist_localdoc_DATA = latex/CouchDB.pdf.gz
 
@@ -114,11 +113,11 @@ nobase_dist_localdoc_DATA = \
     html/searchindex.js \
     html/ssl.html
 
-$(info_files): info
+$(info_TEXINFOS): texinfo
 
-$(pdf_files): pdf
+$(dist_localdoc_DATA): pdf
 
-$(html_files): html
+$(nobase_dist_localdoc_DATA): html
 
 # @@ convert both targets to use stamp files
 # http://www.gnu.org/software/automake/manual/html_node/Multiple-Outputs.html
@@ -130,12 +129,12 @@ $(html_files): html
 # @@ seems to get called twice during the build
 # @@ use stamp files, this gets called twice during install too
 
-info:
+texinfo:
 	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) texinfo
-	make -C $texinfo info
 
 dvi:
 	@echo "This target is not supported."
+
 ps:
 	@echo "This target is not supported."
 
@@ -147,9 +146,6 @@ pdf:
 html: ../src/_static
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) html
 
-install-info:
-	@echo "This target is not supported. Please use `install'."
-
 install-dvi:
 	@echo "This target is not supported."
 
@@ -157,10 +153,10 @@ install-ps:
 	@echo "This target is not supported."
 
 install-pdf:
-	@echo "This target is not supported. Please use `install'."
+	@echo "This target is not supported. Use \`install-data\` instead."
 
 install-html:
-	@echo "This target is not supported. Please use `install'."
+	@echo "This target is not supported. Use \`install-data\` instead."
 
 # @@ figure out how to remove this _static dir
 ../src/_static:
@@ -188,4 +184,4 @@ maintainer-clean-local:
 # "make dvi" fails
 # "make ps" fails
 
-# @@ fix package name which turns out as "apache-couchdb"
\ No newline at end of file
+# @@ fix package name which turns out as "apache-couchdb"


Mime
View raw message