Merge commit 'ccf40b91'

Conflicts:
	Makefile

Makefile

 PREFIX=/usr
 DOCDIR=$(PREFIX)/share/doc/$(self)
 ZSHDIR=$(PREFIX)/share/zsh/vendor-completions
+RONN ?= ronn
 
 self=vcsh
 manpages=$(self).1
@@ -22,7 +23,7 @@ install: all
 manpages: $(manpages)
 
 $(self).1: doc/$(self).1.ronn
-	ronn < doc/$(self).1.ronn > $(self).1
+	$(RONN) < doc/$(self).1.ronn > $(self).1 || rm $(self).1
 
 clean:
 	rm -rf $(self).1