From: Richard Hartmann <richih@debian.org>
Date: Sun, 27 Oct 2013 11:16:27 +0000 (+0100)
Subject: Merge commit 'ccf40b91a67127084ee81e875ee5b77b3b0f019d'
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/59e6ad117e74d60918a7c7f8fc4854f23cff67cf?hp=ccf40b91a67127084ee81e875ee5b77b3b0f019d

Merge commit 'ccf40b91a67127084ee81e875ee5b77b3b0f019d'

Conflicts:
	Makefile
---

diff --git a/Makefile b/Makefile
index 18ea7cd..429ecd6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,6 @@
 PREFIX=/usr
+DOCDIR=$(PREFIX)/share/doc/$(self)
+ZSHDIR=$(PREFIX)/share/zsh/vendor-completions
 RONN ?= ronn
 
 self=vcsh
@@ -12,11 +14,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 -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)
 
@@ -29,16 +31,16 @@ clean:
 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/
-	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