completion: Return the correct error code from __vcsh_*.

[code/vcsh.git] / Makefile

diff --git a/Makefile b/Makefile
index cb112c72b619dec628d167f17f75630a99bb34fd..b9154e7fec6cc97c5029011fbb6d534a4d20f7c6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,8 @@
-PREFIX=/usr
+PREFIX?=/usr
+DOCDIR_PREFIX=$(PREFIX)/share/doc
+DOCDIR=$(DOCDIR_PREFIX)/$(self)
+ZSHDIR=$(PREFIX)/share/zsh/vendor-completions
+RONN ?= ronn
 
 self=vcsh
 manpages=$(self).1
@@ -11,16 +15,16 @@ install: all
        install -m 0755 $(self) $(DESTDIR)$(PREFIX)/bin
        install -d $(DESTDIR)$(PREFIX)/share/man/man1
        install -m 0644 $(manpages) $(DESTDIR)$(PREFIX)/share/man/man1
-       install -d $(DESTDIR)$(PREFIX)/share/doc/$(self)
-       install -m 0644 README.md $(DESTDIR)$(PREFIX)/share/doc/$(self)
-       install -m 0644 doc/hooks $(DESTDIR)$(PREFIX)/share/doc/$(self)
-       install -d $(DESTDIR)$(PREFIX)/share/zsh/vendor-completions
-       install -m 0644 _$(self) $(DESTDIR)$(PREFIX)/share/zsh/vendor-completions
+       install -d $(DESTDIR)$(DOCDIR)
+       install -m 0644 README.md $(DESTDIR)$(DOCDIR)
+       install -m 0644 doc/hooks $(DESTDIR)$(DOCDIR)
+       install -d $(DESTDIR)$(ZSHDIR)
+       install -m 0644 _$(self) $(DESTDIR)$(ZSHDIR)
 
 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
@@ -28,19 +32,20 @@ clean:
 uninstall:
        rm -rf $(DESTDIR)$(PREFIX)/bin/$(self)
        rm -rf $(DESTDIR)$(PREFIX)/share/man/man1/$(self).1
-       rm -rf $(DESTDIR)$(PREFIX)/share/doc/$(self)
-       rm -rf $(DESTDIR)$(PREFIX)/share/zsh/vendor-completions/_$(self)
+       rm -rf $(DESTDIR)$(DOCDIR)
+       rm -rf $(DESTDIR)$(ZSHDIR)/_$(self)
 
 # Potentially harmful, used a non-standard option on purpose.
 # If PREFIX=/usr/local and that's empty...
 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)$(PREFIX)/share/doc/
-       rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/zsh/vendor-completions/
+       rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(DOCDIR)
+       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
+       @if which prove > /dev/null; then prove; else echo "'prove' not found; not running tests";         fi
 
 moo:
-       @if [ -x /usr/games/cowsay ]; then /usr/games/cowsay "I hope you're happy now..."; fi
+       @which cowsay >/dev/null 2>&1 && cowsay "I hope you're happy now..."