[master] 331fab1 Move the built HTML documentation to doc/html/.

Lasse Karstensen lkarsten at varnish-software.com
Tue Jul 7 21:31:55 CEST 2015

commit 331fab1f8cb1d1615b19af2ba141803dd51a9d52
Author: Lasse Karstensen <lkarsten at varnish-software.com>
Date:   Tue Jul 7 21:26:11 2015 +0200

    Move the built HTML documentation to doc/html/.
    I think it makes sense to ship a built HTML copy in
    the tarball, as well as the RST sources.
    The old cleanup code was a tad eager and made phk miss
    his svg. Hopefully this way is a bit more future proof.
    automake is our friend.
    We might have to update some packaging files later on.
    (and perhaps the git push hook.)

diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
index 0ec3328..c03a448 100644
--- a/doc/sphinx/Makefile.am
+++ b/doc/sphinx/Makefile.am
@@ -117,9 +117,7 @@ EXTRA_DIST = \
 	$(MAKE) html
 	rm -rf $(BUILDDIR)/doctrees
-	cp -r $(BUILDDIR) $(distdir)
-# Remove any extra non-rst files we may have copied over.
-	find $(distdir) -mindepth 2 -type f ! -name \*.rst | grep -v '/build/' | xargs rm -f
+	cp -r $(BUILDDIR)/html $(distdir)/../
 	rm -rf $(BUILDDIR)

More information about the varnish-commit mailing list