Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache

doc/sphinx/Makefile.am

@@ -123,6 +123,7 @@ EXTRA_DIST = \
 	reference/varnishstat.rst \
 	reference/varnishtest.rst \
 	reference/varnishtop.rst \
+	reference/varnish-cli.rst \
 	reference/vcl.rst \
 	reference/vmod.rst \
 	tutorial/advanced_backend_servers.rst \

man/Makefile.am

 # $Id$
 
-dist_man_MANS = vcl.7
+dist_man_MANS = vcl.7 varnish-cli.7
+MAINTAINERCLEANFILES = $(dist_man_MANS)
 
 vcl.7: $(top_srcdir)/doc/sphinx/reference/vcl.rst \
 	$(top_srcdir)/bin/varnishd/default.vcl
@@ -12,3 +13,13 @@ else
 	@echo "========================================"
 	@false
 endif
+
+varnish-cli.7: $(top_srcdir)/doc/sphinx/reference/varnish-cli.rst
+if HAVE_RST2MAN
+	${RST2MAN} $(top_srcdir)/doc/sphinx/reference/varnish-cli.rst $@
+else
+	@echo "========================================"
+	@echo "You need rst2man installed to make dist"
+	@echo "========================================"
+	@false
+endif