vcsh: Make `vcsh which dontexist` exit 1

[code/vcsh.git] / Makefile

diff --git a/Makefile b/Makefile
index 18ea7cd71615aba3896ce9707af428458ae12843..9e3d5a22c5710325afb465891dbbb6a1f69937b3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,7 @@
-PREFIX=/usr
+PREFIX?=/usr
+DOCDIR_PREFIX=$(PREFIX)/share/doc
+DOCDIR=$(DOCDIR_PREFIX)/$(self)
+ZSHDIR=$(PREFIX)/share/zsh/vendor-completions

 RONN ?= ronn
 
 self=vcsh
 RONN ?= ronn
 
 self=vcsh


@@ -12,11 +15,11 @@ install: all
        install -m 0755 $(self) $(DESTDIR)$(PREFIX)/bin
        install -d $(DESTDIR)$(PREFIX)/share/man/man1
        install -m 0644 $(manpages) $(DESTDIR)$(PREFIX)/share/man/man1
        install -m 0755 $(self) $(DESTDIR)$(PREFIX)/bin
        install -d $(DESTDIR)$(PREFIX)/share/man/man1
        install -m 0644 $(manpages) $(DESTDIR)$(PREFIX)/share/man/man1

-       install -d $(DESTDIR)$(PREFIX)/share/doc/$(self)
-       install -m 0644 README.md $(DESTDIR)$(PREFIX)/share/doc/$(self)
-       install -m 0644 doc/hooks $(DESTDIR)$(PREFIX)/share/doc/$(self)
-       install -d $(DESTDIR)$(PREFIX)/share/zsh/vendor-completions
-       install -m 0644 _$(self) $(DESTDIR)$(PREFIX)/share/zsh/vendor-completions
+       install -d $(DESTDIR)$(DOCDIR)
+       install -m 0644 README.md $(DESTDIR)$(DOCDIR)
+       install -m 0644 doc/hooks $(DESTDIR)$(DOCDIR)
+       install -d $(DESTDIR)$(ZSHDIR)
+       install -m 0644 _$(self) $(DESTDIR)$(ZSHDIR)

 
 manpages: $(manpages)
 
 
 manpages: $(manpages)
 


@@ -29,19 +32,19 @@ clean:
 uninstall:
        rm -rf $(DESTDIR)$(PREFIX)/bin/$(self)
        rm -rf $(DESTDIR)$(PREFIX)/share/man/man1/$(self).1
 uninstall:
        rm -rf $(DESTDIR)$(PREFIX)/bin/$(self)
        rm -rf $(DESTDIR)$(PREFIX)/share/man/man1/$(self).1

-       rm -rf $(DESTDIR)$(PREFIX)/share/doc/$(self)
-       rm -rf $(DESTDIR)$(PREFIX)/share/zsh/vendor-completions/_$(self)
+       rm -rf $(DESTDIR)$(DOCDIR)
+       rm -rf $(DESTDIR)$(ZSHDIR)/_$(self)

 
 # Potentially harmful, used a non-standard option on purpose.
 # If PREFIX=/usr/local and that's empty...
 purge: uninstall
        rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/bin/
        rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/man/man1/
 
 # Potentially harmful, used a non-standard option on purpose.
 # If PREFIX=/usr/local and that's empty...
 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)$(PREFIX)/share/doc/
-       rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/zsh/vendor-completions/
+       rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(DOCDIR_PREFIX)
+       rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(ZSHDIR)

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