[master] 4482199 Don't package build/doctrees in tarball.

Lasse Karstensen lkarsten at varnish-software.com
Mon May 19 13:06:31 CEST 2014


commit 448219905424d04f3a77cb3af64fcca4bfebdc17
Author: Lasse Karstensen <lkarsten at varnish-software.com>
Date:   Mon May 19 12:59:04 2014 +0200

    Don't package build/doctrees in tarball.
    
    These are just intermediate files written by Sphinx to
    build the HTML documentation. We don't need to distribute
    them.

diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
index dbed031..22dd894 100644
--- a/doc/sphinx/Makefile.am
+++ b/doc/sphinx/Makefile.am
@@ -91,89 +91,21 @@ doctest:
 EXTRA_DIST = \
 	conf.py \
 	index.rst \
-	glossary/index.rst \
-	installation/bugs.rst \
-	installation/help.rst \
-	installation/index.rst \
-	installation/install.rst \
-	installation/platformnotes.rst \
-	installation/prerequisites.rst \
-	phk/autocrap.rst \
-	phk/backends.rst \
-	phk/barriers.rst \
-	phk/gzip.rst \
-	phk/http20.rst \
-	phk/index.rst \
-	phk/ipv6suckage.rst \
-	phk/platforms.rst \
-	phk/spdy.rst \
-	phk/sphinx.rst \
-	phk/ssl.rst \
-	phk/thetoolsweworkwith.rst \
-	phk/thoughts.rst \
-	phk/three-zero.rst \
-	phk/varnish_does_not_hash.rst \
-	phk/vcl_expr.rst \
-	phk/wanton_destruction.rst \
-	reference/index.rst \
-	reference/varnish-cli.rst \
-	reference/varnishadm.rst \
-	reference/varnishd.rst \
-	reference/varnishhist.rst \
-	reference/varnishlog.rst \
-	reference/varnishncsa.rst \
-	reference/varnishstat.rst \
-	reference/varnishtest.rst \
-	reference/varnishtop.rst \
-	reference/vcl.rst \
-	reference/vmod.rst \
-	reference/vsl-query.rst \
-	reference/vsl.rst \
-	reference/vsm.rst \
-	tutorial/backend_servers.rst \
-	tutorial/index.rst \
-	tutorial/introduction.rst \
-	tutorial/now_what.rst \
-	tutorial/peculiarities.rst \
-	tutorial/putting_varnish_on_port_80.rst \
-	tutorial/starting_varnish.rst \
-	users-guide/command-line.rst \
-	users-guide/compression.rst \
-	users-guide/devicedetection.rst \
-	users-guide/esi.rst \
-	users-guide/increasing-your-hitrate.rst \
-	users-guide/index.rst \
-	users-guide/intro.rst \
-	users-guide/operation-logging.rst \
-	users-guide/operation-statistics.rst \
-	users-guide/params.rst \
-	users-guide/performance.rst \
-	users-guide/purging.rst \
-	users-guide/report.rst \
-	users-guide/run_cli.rst \
-	users-guide/run_security.rst \
-	users-guide/running.rst \
-	users-guide/sizing-your-cache.rst \
-	users-guide/storage-backends.rst \
-	users-guide/troubleshooting.rst \
-	users-guide/vcl-actions.rst \
-	users-guide/vcl-backends.rst \
-	users-guide/vcl-built-in-subs.rst \
-	users-guide/vcl-example-acls.rst \
-	users-guide/vcl-example-manipulating-headers.rst \
-	users-guide/vcl-example-manipulating-responses.rst \
-	users-guide/vcl-example-websockets.rst \
-	users-guide/vcl-examples.rst \
-	users-guide/vcl-hashing.rst \
-	users-guide/vcl-inline-c.rst \
-	users-guide/vcl-grace.rst \
-	users-guide/vcl-syntax.rst \
-	users-guide/vcl-variables.rst \
-	users-guide/vcl.rst
+	include \
+	glossary \
+	installation \
+	phk \
+	reference \
+	tutorial \
+	users-guide \
+	whats-new
 
 dist-hook:
 	$(MAKE) html
+	rm -rf $(BUILDDIR)/doctrees
 	cp -r $(BUILDDIR) $(distdir)
+# Remove any extra non-rst files we may have copied over.
+	find $(distdir) ! -type f -a -name \*.rst -ls
 
 distclean-local:
 	rm -rf $(BUILDDIR)



More information about the varnish-commit mailing list