From 2c849198f6847a814874563b604c4b2dd93e20e6 Mon Sep 17 00:00:00 2001 From: Jannis Friedmann Date: Sat, 12 May 2012 14:30:40 +0200 Subject: [PATCH] Fixed Makefile * doesn't try to install and uninstall zsh-addon if zsh is not installed * creates folders when they are missing (fixes installation bug on ubuntu 12.04) --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 53880ef0..b087bb12 100644 --- a/Makefile +++ b/Makefile @@ -2,13 +2,15 @@ install: gcc -o "ponysaytruncater" "ponysaytruncater.c" 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 -r ponies/*.pony "$(DESTDIR)/usr/share/ponies/" + cp -r ttyponies/*.pony "$(DESTDIR)/usr/share/ttyponies/" install "ponysay" "$(DESTDIR)/usr/bin/ponysay" install -s "ponysaytruncater" "$(DESTDIR)/usr/bin/ponysaytruncater" ln -sf "ponysay" "$(DESTDIR)/usr/bin/ponythink" - install "completion/zsh-completion.zsh" "$(DESTDIR)/usr/share/zsh/site-functions/_ponysay" + 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/" 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: @@ -17,6 +19,6 @@ uninstall: unlink "$(DESTDIR)/usr/bin/ponysay" unlink "$(DESTDIR)/usr/bin/ponysaytruncater" unlink "$(DESTDIR)/usr/bin/ponythink" - unlink "$(DESTDIR)/usr/share/zsh/site-functions/_ponysay" + if [ -e "$(DESTDIR)/usr/share/zsh/site-functions/_ponysay" ]; then unlink "$(DESTDIR)/usr/share/zsh/site-functions/_ponysay"; fi unlink "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" unlink "$(DESTDIR)/usr/share/bash-completion/completions/ponysay"