Merge branch 'master' of github.com:RichiH/vcsh

[code/vcsh.git] / Makefile

diff --git a/Makefile b/Makefile
index ebe4b2b6cf2e67b2d7c4b1084f6556b545670880..21be0527f9b0b1061f7ed7a5eaef8ead2cf55bf0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PREFIX=/usr
+PREFIX?=/usr

 DOCDIR_PREFIX=$(PREFIX)/share/doc
 DOCDIR=$(DOCDIR_PREFIX)/$(self)
 ZSHDIR=$(PREFIX)/share/zsh/vendor-completions
 DOCDIR_PREFIX=$(PREFIX)/share/doc
 DOCDIR=$(DOCDIR_PREFIX)/$(self)
 ZSHDIR=$(PREFIX)/share/zsh/vendor-completions


@@ -40,11 +40,12 @@ 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/
 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)$(DOCDIR_PREFIX)
+       rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(DOCDIR)

        rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(ZSHDIR)
 
 test:
        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:
 
 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..."