Fix tests under git 2.2

[code/vcsh.git] / Makefile

diff --git a/Makefile b/Makefile
index d62b5cffe3ee51059ca3fe21842812963daae8c3..b9154e7fec6cc97c5029011fbb6d534a4d20f7c6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,8 @@
-PREFIX=/usr
-DOCDIR=$(PREFIX)/share/doc/$(self)
+PREFIX?=/usr
+DOCDIR_PREFIX=$(PREFIX)/share/doc
+DOCDIR=$(DOCDIR_PREFIX)/$(self)

 ZSHDIR=$(PREFIX)/share/zsh/vendor-completions
 ZSHDIR=$(PREFIX)/share/zsh/vendor-completions

+RONN ?= ronn

 
 self=vcsh
 manpages=$(self).1
 
 self=vcsh
 manpages=$(self).1


@@ -22,7 +24,7 @@ install: all
 manpages: $(manpages)
 
 $(self).1: doc/$(self).1.ronn
 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
 
 clean:
        rm -rf $(self).1


@@ -38,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)$(shell dirname $(DOCDIR))
+       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..."