couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject git commit: Experimental change that doesn't install empty docs
Date Sat, 24 Nov 2012 19:39:51 GMT
Updated Branches:
  refs/heads/docs 9e561651d -> 96327cd70


Experimental change that doesn't install empty docs


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

Branch: refs/heads/docs
Commit: 96327cd70e5502b00cd41065a34ea87d2dd813ef
Parents: 9e56165
Author: Noah Slater <nslater@apache.org>
Authored: Sat Nov 24 19:39:46 2012 +0000
Committer: Noah Slater <nslater@apache.org>
Committed: Sat Nov 24 19:39:46 2012 +0000

----------------------------------------------------------------------
 Makefile.am                 |   44 +++++++++++++++---------------
 bin/Makefile.am             |    1 -
 share/doc/build/Makefile.am |   53 ++++++++++++++++++++++++-------------
 3 files changed, 56 insertions(+), 42 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/96327cd7/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 5e83421..bae8494 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,38 +47,38 @@ EXTRA_DIST = \
     build-aux/sphinx-touch \
     license.skip
 
-AUTHORS.gz: $(top_srcdir)/AUTHORS
-	-gzip -9 < $< > $@
+AUTHORS.gz: AUTHORS
+	gzip -9 < $< > $@
 
-BUGS.gz: $(top_srcdir)/BUGS
-	-gzip -9 < $< > $@
+BUGS.gz: BUGS
+	gzip -9 < $< > $@
 
-CHANGES.gz: $(top_srcdir)/CHANGES
-	-gzip -9 < $< > $@
+CHANGES.gz: CHANGES
+	gzip -9 < $< > $@
 
-DEVELOPERS.gz: $(top_srcdir)/DEVELOPERS
-	-gzip -9 < $< > $@
+DEVELOPERS.gz: DEVELOPERS
+	gzip -9 < $< > $@
 
-INSTALL.gz: $(top_srcdir)/INSTALL
-	-gzip -9 < $< > $@
+INSTALL.gz: INSTALL
+	gzip -9 < $< > $@
 
-INSTALL.Unix.gz: $(top_srcdir)/INSTALL.Unix
-	-gzip -9 < $< > $@
+INSTALL.Unix.gz: INSTALL.Unix
+	gzip -9 < $< > $@
 
-INSTALL.Windows.gz: $(top_srcdir)/INSTALL.Windows
-	-gzip -9 < $< > $@
+INSTALL.Windows.gz: INSTALL.Windows
+	gzip -9 < $< > $@
 
-LICENSE.gz: $(top_srcdir)/LICENSE
-	-gzip -9 < $< > $@
+LICENSE.gz: LICENSE
+	gzip -9 < $< > $@
 
-NEWS.gz: $(top_srcdir)/NEWS
-	-gzip -9 < $< > $@
+NEWS.gz: NEWS
+	gzip -9 < $< > $@
 
-NOTICE.gz: $(top_srcdir)/NOTICE
-	-gzip -9 < $< > $@
+NOTICE.gz: NOTICE
+	gzip -9 < $< > $@
 
-README.gz: $(top_srcdir)/README
-	-gzip -9 < $< > $@
+README.gz: README
+	gzip -9 < $< > $@
 
 .PHONY: THANKS.gz
 THANKS.gz: $(top_srcdir)/THANKS

http://git-wip-us.apache.org/repos/asf/couchdb/blob/96327cd7/bin/Makefile.am
----------------------------------------------------------------------
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 1bfb6dc..1f3dda8 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -107,7 +107,6 @@ couch-config_dev: couch-config.tpl
 	$@ < $<
 	chmod +x $@
 
-
 HELP2MAN_OPTION=--no-info --help-option="-h" --version-option="-V"
 
 # Depend on source files so distributed man pages are not rebuilt for end user.

http://git-wip-us.apache.org/repos/asf/couchdb/blob/96327cd7/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index cf3d0d6..f6b7bda 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -43,11 +43,13 @@ SPHINXOPTS = \
 
 # -----------------------------------------------------------------------------
 
-info_name = CouchDB
+info_file_dist = texinfo/CouchDB.info
 
-info_file = texinfo/$(info_name).info
+info_file_inst = CouchDB
 
-pdf_file = latex/CouchDB.pdf.gz
+pdf_file_dist = latex/CouchDB.pdf
+
+pdf_file_inst = CouchDB.pdf.gz
 
 html_files = \
     html/_images/futon-createdb.png \
@@ -142,12 +144,6 @@ src_files = \
     ../src/replication.rst \
     ../src/ssl.rst
 
-dist_localdoc_DATA = \
-    $(info_file) \
-    $(pdf_file)
-
-nobase_dist_localdoc_DATA = $(html_files)
-
 EXTRA_DIST = \
     ../src/conf.py \
     ../demo.mk \
@@ -155,13 +151,20 @@ EXTRA_DIST = \
     ../Makefile.am \
     $(image_files) \
     $(src_files) \
-    html/.buildinfo
+    $(info_file_dist) \
+    $(pdf_file_dist) \
+    $(html_files)
 
-$(pdf_file): pdf
+BUILT_SOURCES = \
+    $(info_file_dist) \
+    $(pdf_file_dist) \
+    $(html_files)
+
+$(pdf_file_dist): pdf
 
 $(html_files): html
 
-$(info_file): info.stamp
+$(info_file_dist): info.stamp
 	@if test -f $@; then :; else \
 	    rm -f info.stamp; \
 	    $(MAKE) $(AM_MAKEFLAGS) info.stamp; \
@@ -173,7 +176,7 @@ info.stamp: $(image_files) $(src_files)
 	$(top_srcdir)/build-aux/sphinx-build \
 	    -b texinfo $(SPHINXOPTS) $(builddir)/texinfo
 	$(MAKE) -C texinfo info
-	$(top_srcdir)/build-aux/sphinx-touch $(info_file)
+	$(top_srcdir)/build-aux/sphinx-touch $(info_file_dist)
 	@mv -f info.tmp $@
 
 $(pdf_file): pdf.stamp
@@ -188,8 +191,8 @@ pdf.stamp: $(image_files) $(src_files)
 	$(top_srcdir)/build-aux/sphinx-build \
 	    -b latex $(SPHINXOPTS) $(builddir)/latex
 	$(MAKE) -C latex all-pdf
-	$(top_srcdir)/build-aux/sphinx-touch latex/CouchDB.pdf
-	gzip -9 < latex/CouchDB.pdf > latex/CouchDB.pdf.gz
+	$(top_srcdir)/build-aux/sphinx-touch $(pdf_file_dist)
+	gzip -9 < $(pdf_file_dist) > $(pdf_file_dist).gz
 	@mv -f pdf.tmp $@
 
 $(html_files): html.stamp
@@ -214,15 +217,27 @@ html-local:
 
 # @@ check AM_UPDATE_INFO_DIR=no
 install-data-local:
-	$(INSTALL) -d $(DESTDIR)$(infodir)
-	if test -s $(info_file); then \
-	    $(INSTALL_DATA) $(info_file) $(DESTDIR)$(infodir)/$(info_name); \
+	if test -s $(info_file_dist); then \
+	    $(INSTALL) -d $(DESTDIR)$(infodir); \
+	    $(INSTALL_DATA) \
+	        $(info_file_dist) $(DESTDIR)$(infodir)/$(info_file_inst); \
 	    if test -n "`which install-info`"; then \
 	        install-info \
 	            --info-dir=$(DESTDIR)$(infodir) \
-	            $(DESTDIR)$(infodir)/$(info_name); \
+	            $(DESTDIR)$(infodir)/$(info_file_inst); \
 	    fi \
 	fi
+	if test -s $(pdf_file_dist); then \
+	    $(INSTALL) -d $(DESTDIR)$(localdocdir); \
+	    $(INSTALL_DATA) \
+	        $(pdf_file_dist).gz $(DESTDIR)$(localdocdir)/$(pdf_file_inst); \
+	fi
+	for file in $(html_files); do \
+	    if test -s $$file; then \
+	        $(INSTALL) -d `dirname $(DESTDIR)$(localdocdir)/$$file`; \
+	        $(INSTALL_DATA) $$file $(DESTDIR)$(localdocdir)/$$file; \
+	    fi \
+	done
 
 # @@ check AM_UPDATE_INFO_DIR=no
 uninstall-local:


Mime
View raw message