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

Merge pull request #90 from Dridi/feature--makefile_dirs
[code/vcsh.git] / Makefile
index a52e9edf49b4996a99dad1658c93c9c19a12b1b7..d62b5cffe3ee51059ca3fe21842812963daae8c3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,6 @@
 PREFIX=/usr
 PREFIX=/usr
+DOCDIR=$(PREFIX)/share/doc/$(self)
+ZSHDIR=$(PREFIX)/share/zsh/vendor-completions
 
 self=vcsh
 manpages=$(self).1
 
 self=vcsh
 manpages=$(self).1
@@ -11,11 +13,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)
 
@@ -28,19 +30,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)$(shell dirname $(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
 
 moo:
 
 test:
        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
+       @if [ -x /usr/games/cowsay ]; then /usr/games/cowsay "I hope you're happy now..."; fi