From: Richard Hartmann Date: Sun, 27 Oct 2013 11:16:27 +0000 (+0100) Subject: Merge commit 'ccf40b91a67127084ee81e875ee5b77b3b0f019d' X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/59e6ad117e74d60918a7c7f8fc4854f23cff67cf?ds=sidebyside Merge commit 'ccf40b91a67127084ee81e875ee5b77b3b0f019d' Conflicts: Makefile --- 59e6ad117e74d60918a7c7f8fc4854f23cff67cf diff --cc Makefile index d62b5cf,18ea7cd..429ecd6 --- a/Makefile +++ b/Makefile @@@ -1,6 -1,5 +1,7 @@@ PREFIX=/usr +DOCDIR=$(PREFIX)/share/doc/$(self) +ZSHDIR=$(PREFIX)/share/zsh/vendor-completions + RONN ?= ronn self=vcsh manpages=$(self).1