]> 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:

vcsh: Improve error handling of clone()
[code/vcsh.git] / Makefile
index d62b5cffe3ee51059ca3fe21842812963daae8c3..9e3d5a22c5710325afb465891dbbb6a1f69937b3 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
+RONN ?= ronn
 
 self=vcsh
 manpages=$(self).1
@@ -22,7 +24,7 @@ install: all
 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
@@ -38,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/
-       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:
-       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