From f8a9088bed7fc73d501228dda5c7afb0aaf2d76a Mon Sep 17 00:00:00 2001 From: Elis Axelsson Date: Fri, 20 Jul 2012 18:29:00 +0200 Subject: Made generation of ponythink completions simpler --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c1ed92e..2faf943 100644 --- a/Makefile +++ b/Makefile @@ -11,9 +11,9 @@ manpages: 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" + sed -e 's/ponysay/ponythink/' -e 's/\/ponythink\//\/ponysay\//' completion/bash-completion.sh > completion/bash-completion-think.sh + sed -e 's/ponysay/ponythink/' -e 's/\/ponythink\//\/ponysay\//' completion/fish-completion.fish > completion/fish-completion-think.fish + sed -e 's/ponysay/ponythink/' -e 's/\/ponythink\//\/ponysay\//' completion/zsh-completion.zsh > completion/zsh-completion-think.zsh ttyponies: -- cgit From 9c859fe68385dfa4dd9b426cd3b790ca31fcfcc3 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 20 Jul 2012 18:47:54 +0200 Subject: Revert "Merge pull request #43 from etu/master" This commit broke bash-completion for ponythink. This reverts commit 9dd1fbe1754ee592059e3c7f33f7ffd66fbfaad5, reversing changes made to 7e5018d58a4cb2f24087e6c3ac8d7b43b3c5066a. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2faf943..c1ed92e 100644 --- a/Makefile +++ b/Makefile @@ -11,9 +11,9 @@ manpages: ponythinkcompletion: - sed -e 's/ponysay/ponythink/' -e 's/\/ponythink\//\/ponysay\//' completion/bash-completion.sh > completion/bash-completion-think.sh - sed -e 's/ponysay/ponythink/' -e 's/\/ponythink\//\/ponysay\//' completion/fish-completion.fish > completion/fish-completion-think.fish - sed -e 's/ponysay/ponythink/' -e 's/\/ponythink\//\/ponysay\//' completion/zsh-completion.zsh > completion/zsh-completion-think.zsh + 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: -- cgit From 6fcb65b964c0ab40fd4d99317e1f0b30629bfd7e Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 20 Jul 2012 19:22:21 +0200 Subject: m + installation of info manual + prebuild PDF --- Makefile | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c1ed92e..9b08250 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -all: ponysaytruncater manpages ponythinkcompletion +all: ponysaytruncater manpages infomanual ponythinkcompletion ponysaytruncater: @@ -6,8 +6,13 @@ ponysaytruncater: manpages: - gzip -9 < manuals/manpage.6 > manuals/manpage.6.gz - gzip -9 < manuals/manpage.es.6 > manuals/manpage.es.6.gz + 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: @@ -28,6 +33,20 @@ ttyponies: done +pdfmanual: + texi2pdf "manuals/ponysay.texinfo" + if [[ -f "ponysay.aux" ]]; then unlink "ponysay.aux"; fi + if [[ -f "ponysay.cp" ]]; then unlink "ponysay.cp" ; fi + if [[ -f "ponysay.cps" ]]; then unlink "ponysay.cps"; fi + if [[ -f "ponysay.fn" ]]; then unlink "ponysay.fn" ; fi + if [[ -f "ponysay.ky" ]]; then unlink "ponysay.ky" ; fi + if [[ -f "ponysay.log" ]]; then unlink "ponysay.log"; fi + if [[ -f "ponysay.pg" ]]; then unlink "ponysay.pg" ; fi + if [[ -f "ponysay.toc" ]]; then unlink "ponysay.toc"; fi + if [[ -f "ponysay.tp" ]]; then unlink "ponysay.tp" ; fi + if [[ -f "ponysay.vr" ]]; then unlink "ponysay.vr" ; fi + + install: all mkdir -p "$(DESTDIR)/usr/share/ponysay/" mkdir -p "$(DESTDIR)/usr/share/ponysay/ponies" @@ -66,6 +85,10 @@ install: all install "manuals/manpage.es.6.gz" "$(DESTDIR)/usr/share/man/es/man6/ponysay.6.gz" ln -sf "ponysay.6.gz" "$(DESTDIR)/usr/share/man/es/man6/ponythink.6.gz" + mkdir -p "$(DESTDIR)/usr/share/info" + install "ponysay.info.gz" "$(DESTDIR)/usr/share/info/ponysay.info.gz" + ln -sf "ponysay.info.gz" "$(DESTDIR)/usr/share/info/ponythink.info.gz" + @echo -e '\n\n'\ '/--------------------------------------------------\\\n'\ '| ___ |\n'\ @@ -103,6 +126,8 @@ uninstall: unlink "$(DESTDIR)/usr/share/man/man6/ponythink.6.gz" unlink "$(DESTDIR)/usr/share/man/es/man6/ponysay.6.gz" 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" clean: @@ -112,4 +137,4 @@ clean: rm "completion/zsh-completion-think.zsh" rm "manuals/manpage.6.gz" rm "manuals/manpage.es.6.gz" - + rm "ponysay.info.gz" -- cgit From f916bbcf642d691c21f06746a912732370760f42 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 20 Jul 2012 19:26:51 +0200 Subject: do not force "all" to run when invoking "make install", it may create files owned by root (in cwd), that should not be owned by root --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9b08250..e259af8 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ pdfmanual: if [[ -f "ponysay.vr" ]]; then unlink "ponysay.vr" ; fi -install: all +install: mkdir -p "$(DESTDIR)/usr/share/ponysay/" mkdir -p "$(DESTDIR)/usr/share/ponysay/ponies" mkdir -p "$(DESTDIR)/usr/share/ponysay/ttyponies" -- cgit From 4e31d07f76befd4f0a26a3cff29a1b56bf1019ae Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 20 Jul 2012 21:23:17 +0200 Subject: issue 45 --- Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e259af8..7f0ee07 100644 --- a/Makefile +++ b/Makefile @@ -88,6 +88,8 @@ install: mkdir -p "$(DESTDIR)/usr/share/info" install "ponysay.info.gz" "$(DESTDIR)/usr/share/info/ponysay.info.gz" ln -sf "ponysay.info.gz" "$(DESTDIR)/usr/share/info/ponythink.info.gz" + install-info --dir-file="/usr/share/info/dir" --entry="Miscellaneous" --description="My Little Ponies for your terminal" "/usr/share/info/ponysay.info.gz" + install-info --dir-file="/usr/share/info/dir" --entry="Miscellaneous" --description="My Little Ponies for your terminal" "/usr/share/info/ponythink.info.gz" @echo -e '\n\n'\ '/--------------------------------------------------\\\n'\ -- cgit From 6f7decf58faeae2a385980bddba0760ae7410f23 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 20 Jul 2012 21:24:19 +0200 Subject: m --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7f0ee07..1cc935b 100644 --- a/Makefile +++ b/Makefile @@ -88,8 +88,8 @@ install: mkdir -p "$(DESTDIR)/usr/share/info" install "ponysay.info.gz" "$(DESTDIR)/usr/share/info/ponysay.info.gz" ln -sf "ponysay.info.gz" "$(DESTDIR)/usr/share/info/ponythink.info.gz" - install-info --dir-file="/usr/share/info/dir" --entry="Miscellaneous" --description="My Little Ponies for your terminal" "/usr/share/info/ponysay.info.gz" - install-info --dir-file="/usr/share/info/dir" --entry="Miscellaneous" --description="My Little Ponies for your terminal" "/usr/share/info/ponythink.info.gz" + 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" @echo -e '\n\n'\ '/--------------------------------------------------\\\n'\ -- cgit From ebae6092e9ade33e5c99e6c0f4f4a9e1387e9aa2 Mon Sep 17 00:00:00 2001 From: Elis Axelsson Date: Fri, 20 Jul 2012 21:44:48 +0200 Subject: Maybe solution for the bug --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1cc935b..24a5808 100644 --- a/Makefile +++ b/Makefile @@ -87,7 +87,7 @@ install: mkdir -p "$(DESTDIR)/usr/share/info" install "ponysay.info.gz" "$(DESTDIR)/usr/share/info/ponysay.info.gz" - ln -sf "ponysay.info.gz" "$(DESTDIR)/usr/share/info/ponythink.info.gz" + install "ponysay.info.gz" "$(DESTDIR)/usr/share/info/ponythink.info.gz" 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" -- cgit From 202340218b85d723d9611fd5e6d40ab71f35f81b Mon Sep 17 00:00:00 2001 From: Erkin Batu Altunbaş Date: Sat, 21 Jul 2012 16:03:54 +0300 Subject: Add force flag to rm commands on clean because of write-protected regular files. --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 24a5808..490c782 100644 --- a/Makefile +++ b/Makefile @@ -134,9 +134,9 @@ uninstall: clean: rm -f "ponysaytruncater" - rm "completion/bash-completion-think.sh" - rm "completion/fish-completion-think.fish" - rm "completion/zsh-completion-think.zsh" - rm "manuals/manpage.6.gz" - rm "manuals/manpage.es.6.gz" - rm "ponysay.info.gz" + rm -f "completion/bash-completion-think.sh" + rm -f "completion/fish-completion-think.fish" + rm -f "completion/zsh-completion-think.zsh" + rm -f "manuals/manpage.6.gz" + rm -f "manuals/manpage.es.6.gz" + rm -f "ponysay.info.gz" -- cgit 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