From 293f4d7403e55d9c597adc561081aff5aa0f621f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= <maandree@operamail.com>
Date: Mon, 2 Jul 2012 11:35:33 +0200
Subject: [PATCH] cleaning up the make file and installing zsh-completion even
 if target directory is missing

---
 Makefile | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index e8d7b7e6..3ae73146 100644
--- a/Makefile
+++ b/Makefile
@@ -1,29 +1,37 @@
-install:
+all: ponysaytruncater
+
+ponysaytruncater:
 	gcc -o "ponysaytruncater" "ponysaytruncater.c"
+
+install: all
 	mkdir -p "$(DESTDIR)/usr/share/ponies"
 	mkdir -p "$(DESTDIR)/usr/share/ttyponies"
-	cp -r ponies/*.pony "$(DESTDIR)/usr/share/ponies/"
-	cp -r ttyponies/*.pony "$(DESTDIR)/usr/share/ttyponies/"
+	cp ponies/*.pony "$(DESTDIR)/usr/share/ponies/"
+	cp ttyponies/*.pony "$(DESTDIR)/usr/share/ttyponies/"
+
 	mkdir -p "$(DESTDIR)/usr/bin/"
 	install "ponysay" "$(DESTDIR)/usr/bin/ponysay"
 	install -s "ponysaytruncater" "$(DESTDIR)/usr/bin/ponysaytruncater"
 	ln -sf "ponysay" "$(DESTDIR)/usr/bin/ponythink"
-	if [ -d "$(DESTDIR)/usr/share/zsh/site-functions/" ]; then install "completion/zsh-completion.zsh" "$(DESTDIR)/usr/share/zsh/site-functions/_ponysay"; fi
-	mkdir -p "$(DESTDIR)/usr/share/bash-completion/completions/"
-	mkdir -p "$(DESTDIR)/usr/share/licenses/ponysay/"
-	install "COPYING" "$(DESTDIR)/usr/share/licenses/ponysay/COPYING"
+
+	mkdir -p "$(DESTDIR)/usr/share/zsh/site-functions/"
+	install "completion/zsh-completion.zsh" "$(DESTDIR)/usr/share/zsh/site-functions/_ponysay"
+
 	mkdir -p "$(DESTDIR)/usr/share/bash-completion/completions/"
 	install "completion/bash-completion.sh" "$(DESTDIR)/usr/share/bash-completion/completions/ponysay"
 
+	mkdir -p "$(DESTDIR)/usr/share/licenses/ponysay/"
+	install "COPYING" "$(DESTDIR)/usr/share/licenses/ponysay/COPYING"
+
 uninstall:
 	rm -fr "$(DESTDIR)/usr/share/ponies"
 	rm -fr "$(DESTDIR)/usr/share/ttyponies"
 	unlink "$(DESTDIR)/usr/bin/ponysay"
 	unlink "$(DESTDIR)/usr/bin/ponysaytruncater"
 	unlink "$(DESTDIR)/usr/bin/ponythink"
-	if [ -e "$(DESTDIR)/usr/share/zsh/site-functions/_ponysay" ]; then unlink "$(DESTDIR)/usr/share/zsh/site-functions/_ponysay"; fi
+	unlink "$(DESTDIR)/usr/share/zsh/site-functions/_ponysay";
 	unlink "$(DESTDIR)/usr/share/licenses/ponysay/COPYING"
 	unlink "$(DESTDIR)/usr/share/bash-completion/completions/ponysay"
 
 clean:
-	rm -r ponysaytruncater
+	rm -r "ponysaytruncater"