Merge pull request #135 from ajschumacher/patch-1

[code/vcsh.git] / Makefile

diff --git a/Makefile b/Makefile
index 429ecd6e589ea37cad8cf40716767c088e374347..4ae8d889c5f1bd35c5fc915426e008418507d881 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 PREFIX=/usr
 PREFIX=/usr

-DOCDIR=$(PREFIX)/share/doc/$(self)
+DOCDIR_PREFIX=$(PREFIX)/share/doc
+DOCDIR=$(DOCDIR_PREFIX)/$(self)

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


@@ -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/
 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:
        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
 
 moo:
        @if [ -x /usr/games/cowsay ]; then /usr/games/cowsay "I hope you're happy now..."; fi