1 files changed, 16 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index e8d7b7e..3ae7314 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,27 @@
-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/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"
-	mkdir -p "$(DESTDIR)/usr/share/bash-completion/completions/"
-	install "completion/bash-completion.sh" "$(DESTDIR)/usr/share/bash-completion/completions/ponysay"
 
 uninstall:
 	rm -fr "$(DESTDIR)/usr/share/ponies"
@@ -21,9 +29,9 @@ uninstall:
 	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"