vcsh: Fix up the rest of the (relevant) git calls

[code/vcsh.git] / Makefile

diff --git a/Makefile b/Makefile
index 429ecd6e589ea37cad8cf40716767c088e374347..b40c618fa851f98247fa8840679ecbbb2bf606a4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,12 @@
 PREFIX=/usr
-DOCDIR=$(PREFIX)/share/doc/$(self)
+DOCDIR_PREFIX=$(PREFIX)/share/doc
+DOCDIR=$(DOCDIR_PREFIX)/$(self)
 ZSHDIR=$(PREFIX)/share/zsh/vendor-completions
 RONN ?= ronn
 
 self=vcsh
 manpages=$(self).1
-all=test manpages
+all=test
 
 all: $(all)
 
@@ -39,11 +40,11 @@ uninstall:
 purge: uninstall
        rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/bin/
        rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/man/man1/
-       rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(shell dirname $(DOCDIR))
+       rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(DOCDIR_PREFIX)
        rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(ZSHDIR)
 
 test:
-       if which git > /dev/null ; then :; else echo "'git' not found, exiting..."; exit 1; fi
+       @if which git > /dev/null ; then :; else echo "'git' not found, exiting..."; exit 1; fi
 
 moo:
        @if [ -x /usr/games/cowsay ]; then /usr/games/cowsay "I hope you're happy now..."; fi