]> git.madduck.net Git - code/vcsh.git/blobdiff - Makefile

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Fix tests under git 2.2
[code/vcsh.git] / Makefile
index 4ae8d889c5f1bd35c5fc915426e008418507d881..b9154e7fec6cc97c5029011fbb6d534a4d20f7c6 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
@@ -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/
-       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:
-       @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..."