From 7dced5dd382ecebcde1f84a80f5f734b0fd046c2 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 24 Jul 2012 14:57:44 +0200 Subject: fix ponysay -L + fix for issue 53 --- Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 490c782..d4c6503 100644 --- a/Makefile +++ b/Makefile @@ -61,6 +61,7 @@ install: mkdir -p "$(DESTDIR)/usr/lib/ponysay/" install -s "ponysaytruncater" "$(DESTDIR)/usr/lib/ponysay/truncater" install "ponysaylist.pl" "$(DESTDIR)/usr/lib/ponysay/list.pl" + install "ponysaylinklist.pl" "$(DESTDIR)/usr/lib/ponysay/linklist.pl" mkdir -p "$(DESTDIR)/usr/share/bash-completion/completions/" install "completion/bash-completion.sh" "$(DESTDIR)/usr/share/bash-completion/completions/ponysay" @@ -116,6 +117,7 @@ uninstall: unlink "$(DESTDIR)/usr/bin/ponysay" unlink "$(DESTDIR)/usr/bin/ponythink" unlink "$(DESTDIR)/usr/lib/ponysay/list.pl" + unlink "$(DESTDIR)/usr/lib/ponysay/linklist.pl" unlink "$(DESTDIR)/usr/lib/ponysay/truncater" unlink "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" unlink "$(DESTDIR)/usr/share/bash-completion/completions/ponysay" -- cgit From 9fc93bbef458d8660bc9322fb637a3c0273a75b7 Mon Sep 17 00:00:00 2001 From: Erkin Batu Altunbaş Date: Tue, 24 Jul 2012 15:28:29 +0200 Subject: svenstaro: make install obviously should correctly have the other deps set up --- Makefile | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 490c782..269c4e5 100644 --- a/Makefile +++ b/Makefile @@ -1,26 +1,21 @@ all: ponysaytruncater manpages infomanual ponythinkcompletion - ponysaytruncater: gcc -o "ponysaytruncater" "ponysaytruncater.c" - manpages: gzip -9 < "manuals/manpage.6" > "manuals/manpage.6.gz" gzip -9 < "manuals/manpage.es.6" > "manuals/manpage.es.6.gz" - infomanual: makeinfo "manuals/ponysay.texinfo" gzip -9 "ponysay.info" - ponythinkcompletion: sed -e 's/ponysay/ponythink/g' <"completion/bash-completion.sh" | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/bash-completion-think.sh" sed -e 's/ponysay/ponythink/g' <"completion/fish-completion.fish" | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/fish-completion-think.fish" sed -e 's/ponysay/ponythink/g' <"completion/zsh-completion.zsh" | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/zsh-completion-think.zsh" - ttyponies: mkdir -p ttyponies for pony in $$(ls --color=no ponies/); do \ @@ -32,7 +27,6 @@ ttyponies: fi \ done - pdfmanual: texi2pdf "manuals/ponysay.texinfo" if [[ -f "ponysay.aux" ]]; then unlink "ponysay.aux"; fi @@ -46,8 +40,7 @@ pdfmanual: if [[ -f "ponysay.tp" ]]; then unlink "ponysay.tp" ; fi if [[ -f "ponysay.vr" ]]; then unlink "ponysay.vr" ; fi - -install: +install: all mkdir -p "$(DESTDIR)/usr/share/ponysay/" mkdir -p "$(DESTDIR)/usr/share/ponysay/ponies" mkdir -p "$(DESTDIR)/usr/share/ponysay/ttyponies" @@ -109,7 +102,6 @@ install: '\\--------------------------------------------------/' @echo '' | ./ponysay -f ./`if [[ "$$TERM" = "linux" ]]; then echo ttyponies; else echo ponies; fi`/pinkiecannon.pony | tail --lines=30 ; echo -e '\n' - uninstall: rm -fr "$(DESTDIR)/usr/share/ponysay/ponies" rm -fr "$(DESTDIR)/usr/share/ponysay/ttyponies" @@ -131,7 +123,6 @@ uninstall: unlink "$(DESTDIR)/usr/share/info/ponysay.info.gz" unlink "$(DESTDIR)/usr/share/info/ponythink.info.gz" - clean: rm -f "ponysaytruncater" rm -f "completion/bash-completion-think.sh" -- cgit From 71a87529a5f753ce55dbf5cf416f5067e20cd71b Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 24 Jul 2012 18:50:19 +0200 Subject: Edit Makefile for submodule ponyquotes --- Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 4feb3fc..114198e 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -all: ponysaytruncater manpages infomanual ponythinkcompletion +all: ponysaytruncater manpages infomanual ponythinkcompletion submodules ponysaytruncater: gcc -o "ponysaytruncater" "ponysaytruncater.c" @@ -16,6 +16,9 @@ ponythinkcompletion: sed -e 's/ponysay/ponythink/g' <"completion/fish-completion.fish" | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/fish-completion-think.fish" sed -e 's/ponysay/ponythink/g' <"completion/zsh-completion.zsh" | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/zsh-completion-think.zsh" +submodules: + (cd "ponyquotes4ponysay/"; make -B) + ttyponies: mkdir -p ttyponies for pony in $$(ls --color=no ponies/); do \ @@ -85,6 +88,8 @@ install: all install-info --dir-file="$(DESTDIR)/usr/share/info/dir" --entry="Miscellaneous" --description="My Little Ponies for your terminal" "$(DESTDIR)/usr/share/info/ponysay.info.gz" install-info --dir-file="$(DESTDIR)/usr/share/info/dir" --entry="Miscellaneous" --description="My Little Ponies for your terminal" "$(DESTDIR)/usr/share/info/ponythink.info.gz" + (cd "ponyquotes4ponysay/"; make DESTDIR="$(DESTDIR)" install) + @echo -e '\n\n'\ '/--------------------------------------------------\\\n'\ '| ___ |\n'\ @@ -124,6 +129,7 @@ uninstall: unlink "$(DESTDIR)/usr/share/man/es/man6/ponythink.6.gz" unlink "$(DESTDIR)/usr/share/info/ponysay.info.gz" unlink "$(DESTDIR)/usr/share/info/ponythink.info.gz" + (cd "ponyquotes4ponysay/"; make DESTDIR="$(DESTDIR)" uninstall) clean: rm -f "ponysaytruncater" @@ -133,3 +139,4 @@ clean: rm -f "manuals/manpage.6.gz" rm -f "manuals/manpage.es.6.gz" rm -f "ponysay.info.gz" + (cd "ponyquotes4ponysay/"; make clean) -- cgit From 2ecc64cb70bef93e522924460e9debf3127cbfa6 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 24 Jul 2012 19:00:23 +0200 Subject: Makefile updates submodules --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 114198e..32be888 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,7 @@ ponythinkcompletion: sed -e 's/ponysay/ponythink/g' <"completion/zsh-completion.zsh" | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/zsh-completion-think.zsh" submodules: + git submodule update (cd "ponyquotes4ponysay/"; make -B) ttyponies: -- cgit