From b900d6e82a304ffe78eb7e5db9b76e63209b194c Mon Sep 17 00:00:00 2001 From: Erkin Batu Altunbaş Date: Fri, 11 May 2012 19:40:48 +0300 Subject: Safety/portability etc measures. Probably missed something somewhere. --- Makefile | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6a6e8dc..10794fa 100644 --- a/Makefile +++ b/Makefile @@ -1,18 +1,16 @@ 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/ - install -Dm755 ponysay $(DESTDIR)/usr/bin/ponysay - install -Dm755 ponysaytruncater $(DESTDIR)/usr/bin/ponysaytruncater - ln -sf ponysay $(DESTDIR)/usr/bin/ponythink + 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/" + install "ponysay" "$(DESTDIR)/usr/bin/ponysay" + install -s "ponysaytruncater" "$(DESTDIR)/usr/bin/ponysaytruncater" + ln -sf "ponysay" "$(DESTDIR)/usr/bin/ponythink" uninstall: - rm -fr $(DESTDIR)/usr/share/ponies -# cp -r ponies/*.pony $(DESTDIR)/usr/share/ponies/ - rm -fr $(DESTDIR)/usr/share/ttyponies -# cp -r ttyponies/*.pony $(DESTDIR)/usr/share/ttyponies/ - rm -f $(DESTDIR)/usr/bin/ponysay - rm -f $(DESTDIR)/usr/bin/ponysaytruncater - unlink $(DESTDIR)/usr/bin/ponythink + 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" -- cgit From a3677eae4affbe53430084f95b8d111a1cbd6245 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 12 May 2012 02:19:59 +0200 Subject: From ponysay-git in AUR by "gtmanfred" with adaption to [erkin]'s last push, and uninstall rutine --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 10794fa..045db2a 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,8 @@ install: install "ponysay" "$(DESTDIR)/usr/bin/ponysay" install -s "ponysaytruncater" "$(DESTDIR)/usr/bin/ponysaytruncater" ln -sf "ponysay" "$(DESTDIR)/usr/bin/ponythink" + install "zsh-completion.zsh" "$(DESTDIR)/usr/share/zsh/site-functions/_ponysay" + install "COPYING" "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" uninstall: rm -fr "$(DESTDIR)/usr/share/ponies" @@ -14,3 +16,5 @@ uninstall: unlink "$(DESTDIR)/usr/bin/ponysay" unlink "$(DESTDIR)/usr/bin/ponysaytruncater" unlink "$(DESTDIR)/usr/bin/ponythink" + unlink "$(DESTDIR)/usr/share/zsh/site-functions/_ponysay" + unlink "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" -- cgit From e76318dd681f6279e12f70ef7fb008806ef79e33 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 12 May 2012 03:00:21 +0200 Subject: ... and (un)install + correction on last push --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 045db2a..53880ef 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,9 @@ install: install "ponysay" "$(DESTDIR)/usr/bin/ponysay" install -s "ponysaytruncater" "$(DESTDIR)/usr/bin/ponysaytruncater" ln -sf "ponysay" "$(DESTDIR)/usr/bin/ponythink" - install "zsh-completion.zsh" "$(DESTDIR)/usr/share/zsh/site-functions/_ponysay" + install "completion/zsh-completion.zsh" "$(DESTDIR)/usr/share/zsh/site-functions/_ponysay" install "COPYING" "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" + install "completion/bash-completion.sh" "$(DESTDIR)/usr/share/bash-completion/completions/ponysay" uninstall: rm -fr "$(DESTDIR)/usr/share/ponies" @@ -18,3 +19,4 @@ uninstall: unlink "$(DESTDIR)/usr/bin/ponythink" unlink "$(DESTDIR)/usr/share/zsh/site-functions/_ponysay" unlink "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" + unlink "$(DESTDIR)/usr/share/bash-completion/completions/ponysay" -- cgit From 2c849198f6847a814874563b604c4b2dd93e20e6 Mon Sep 17 00:00:00 2001 From: Jannis Friedmann Date: Sat, 12 May 2012 14:30:40 +0200 Subject: 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(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 53880ef..b087bb1 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" -- cgit From b82a391c1fc8de626cff32853a3d8e5e68babcb9 Mon Sep 17 00:00:00 2001 From: Elis Axelsson Date: Sun, 13 May 2012 02:01:01 +0200 Subject: Reparied errors about missing directories in isolated install enviroments like sandboxes --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b087bb1..5c47e1a 100644 --- a/Makefile +++ b/Makefile @@ -4,12 +4,12 @@ install: mkdir -p "$(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 -D "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/" - install "COPYING" "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" + install -D "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" -- cgit From e147227c1c8e86b69ee2cfa792f225954ffdc4d2 Mon Sep 17 00:00:00 2001 From: Elis Axelsson Date: Sun, 13 May 2012 02:01:17 +0200 Subject: Added rule, make clean --- Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5c47e1a..4746c8c 100644 --- a/Makefile +++ b/Makefile @@ -22,3 +22,6 @@ uninstall: 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" + +clean: + rm -r ponysaytruncater -- cgit From 900088cd476e10a824d29a78999073a6eef06648 Mon Sep 17 00:00:00 2001 From: Erkin Batu Altunbaş Date: Sun, 13 May 2012 19:35:00 +0300 Subject: Avoid incompatible flags at all costs. `mkdir` creates if it doesn't already exist, so it won't be an issue to replace `install -D` with `mkdir` then `install`. --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 4746c8c..f7ef71d 100644 --- a/Makefile +++ b/Makefile @@ -4,12 +4,14 @@ install: mkdir -p "$(DESTDIR)/usr/share/ttyponies" cp -r ponies/*.pony "$(DESTDIR)/usr/share/ponies/" cp -r ttyponies/*.pony "$(DESTDIR)/usr/share/ttyponies/" - install -D "ponysay" "$(DESTDIR)/usr/bin/ponysay" + mkdir -p "$(DESTDIR)/use/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/" - install -D "COPYING" "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" + 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" -- cgit From d0cad17e9e1f3b57c820bd3c4ddda082cfbcddee Mon Sep 17 00:00:00 2001 From: Erkin Batu Altunbaş Date: Sun, 13 May 2012 19:35:53 +0200 Subject: Stupid web interface tab spacing length... --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f7ef71d..d802960 100644 --- a/Makefile +++ b/Makefile @@ -4,13 +4,13 @@ install: mkdir -p "$(DESTDIR)/usr/share/ttyponies" cp -r ponies/*.pony "$(DESTDIR)/usr/share/ponies/" cp -r ttyponies/*.pony "$(DESTDIR)/usr/share/ttyponies/" - mkdir -p "$(DESTDIR)/use/bin/" + mkdir -p "$(DESTDIR)/use/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/" + 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" -- cgit From 7897783a8fbbbde5bbf4043351765c20443b0592 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sun, 13 May 2012 21:09:31 +0300 Subject: Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d802960..e8d7b7e 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ install: mkdir -p "$(DESTDIR)/usr/share/ttyponies" cp -r ponies/*.pony "$(DESTDIR)/usr/share/ponies/" cp -r ttyponies/*.pony "$(DESTDIR)/usr/share/ttyponies/" - mkdir -p "$(DESTDIR)/use/bin/" + 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" -- cgit From 293f4d7403e55d9c597adc561081aff5aa0f621f Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Mon, 2 Jul 2012 11:35:33 +0200 Subject: cleaning up the make file and installing zsh-completion even if target directory is missing --- Makefile | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'Makefile') 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" -- cgit From 404b144c796ac51c3ca03aa7a2a7de9468938a42 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 4 Jul 2012 09:39:37 +0200 Subject: adding manpage from github.com/kragniz/debian --- Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3ae7314..fceafe5 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,9 @@ install: all mkdir -p "$(DESTDIR)/usr/share/licenses/ponysay/" install "COPYING" "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" + mkdir -p "$(DESTDIR)/usr/share/man/man6" + install "manpage.6" "$(DESTDIR)/usr/share/man/man6/ponysay.6" + uninstall: rm -fr "$(DESTDIR)/usr/share/ponies" rm -fr "$(DESTDIR)/usr/share/ttyponies" -- cgit From 413b5d581c3ac02edd4a4ae5c19257d84b0a4309 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 4 Jul 2012 09:45:18 +0200 Subject: moving manpage to section 1 (consitent with cowsay) --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index fceafe5..467a000 100644 --- a/Makefile +++ b/Makefile @@ -23,8 +23,8 @@ install: all mkdir -p "$(DESTDIR)/usr/share/licenses/ponysay/" install "COPYING" "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" - mkdir -p "$(DESTDIR)/usr/share/man/man6" - install "manpage.6" "$(DESTDIR)/usr/share/man/man6/ponysay.6" + mkdir -p "$(DESTDIR)/usr/share/man/man1" + install "manpage.1" "$(DESTDIR)/usr/share/man/man1/ponysay.1" uninstall: rm -fr "$(DESTDIR)/usr/share/ponies" @@ -35,6 +35,7 @@ uninstall: unlink "$(DESTDIR)/usr/share/zsh/site-functions/_ponysay"; unlink "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" unlink "$(DESTDIR)/usr/share/bash-completion/completions/ponysay" + unlink "$(DESTDIR)/usr/share/man/man1/ponysay.1" clean: rm -r "ponysaytruncater" -- cgit From 4063e82a1512515358480b53d87223f71e0efc20 Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Date: Wed, 4 Jul 2012 23:30:29 -0400 Subject: Migration to /usr/share/ponysay/{,tty}ponies (need more reviews) --- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3ae7314..754009c 100644 --- a/Makefile +++ b/Makefile @@ -4,10 +4,11 @@ ponysaytruncater: gcc -o "ponysaytruncater" "ponysaytruncater.c" install: all - mkdir -p "$(DESTDIR)/usr/share/ponies" - mkdir -p "$(DESTDIR)/usr/share/ttyponies" - cp ponies/*.pony "$(DESTDIR)/usr/share/ponies/" - cp ttyponies/*.pony "$(DESTDIR)/usr/share/ttyponies/" + mkdir -p "$(DESTDIR)/usr/share/ponysay/" + mkdir -p "$(DESTDIR)/usr/share/ponysay/ponies" + mkdir -p "$(DESTDIR)/usr/share/ponysay/ttyponies" + cp ponies/*.pony "$(DESTDIR)/usr/share/ponysay/ponies/" + cp ttyponies/*.pony "$(DESTDIR)/usr/share/ponysay/ttyponies/" mkdir -p "$(DESTDIR)/usr/bin/" install "ponysay" "$(DESTDIR)/usr/bin/ponysay" @@ -24,8 +25,8 @@ install: all install "COPYING" "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" uninstall: - rm -fr "$(DESTDIR)/usr/share/ponies" - rm -fr "$(DESTDIR)/usr/share/ttyponies" + rm -fr "$(DESTDIR)/usr/share/ponysay/ponies" + rm -fr "$(DESTDIR)/usr/share/ponysay/ttyponies" unlink "$(DESTDIR)/usr/bin/ponysay" unlink "$(DESTDIR)/usr/bin/ponysaytruncater" unlink "$(DESTDIR)/usr/bin/ponythink" -- cgit From 4a39ef423041bee3faafc99ee60bf0dbb1229868 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 5 Jul 2012 09:14:14 +0200 Subject: ponythink in manpage + environment variables PONYSAY_SHELL_LINES and PONYSAY_FULL_WIDTH --- Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 467a000..194fa29 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,7 @@ install: all mkdir -p "$(DESTDIR)/usr/share/man/man1" install "manpage.1" "$(DESTDIR)/usr/share/man/man1/ponysay.1" + ln -sf "ponysay.1" "$(DESTDIR)/usr/share/man/man1/ponythink.1" uninstall: rm -fr "$(DESTDIR)/usr/share/ponies" @@ -36,6 +37,7 @@ uninstall: unlink "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" unlink "$(DESTDIR)/usr/share/bash-completion/completions/ponysay" unlink "$(DESTDIR)/usr/share/man/man1/ponysay.1" + unlink "$(DESTDIR)/usr/share/man/man1/ponythink.1" clean: rm -r "ponysaytruncater" -- cgit From 63375b31a0c07f60a6ec760710aaa98cab3be905 Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Date: Tue, 10 Jul 2012 23:08:40 -0400 Subject: Added manpage in Spanish --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e9c3279..2fff65f 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,10 @@ install: all install "manpage.1" "$(DESTDIR)/usr/share/man/man1/ponysay.1" ln -sf "ponysay.1" "$(DESTDIR)/usr/share/man/man1/ponythink.1" + mkdir -p "$(DESTDIR)/usr/share/man/es/man1" + install "manpage.es.1" "$(DESTDIR)/usr/share/man/es/man1/ponysay.1" + ln -sf "ponysay.1" "$(DESTDIR)/usr/share/man/es/man1/ponythink.1" + uninstall: rm -fr "$(DESTDIR)/usr/share/ponysay/ponies" rm -fr "$(DESTDIR)/usr/share/ponysay/ttyponies" @@ -39,6 +43,7 @@ uninstall: unlink "$(DESTDIR)/usr/share/bash-completion/completions/ponysay" unlink "$(DESTDIR)/usr/share/man/man1/ponysay.1" unlink "$(DESTDIR)/usr/share/man/man1/ponythink.1" - + unlink "$(DESTDIR)/usr/share/man/es/man1/ponysay.1" + unlink "$(DESTDIR)/usr/share/man/es/man1/ponysay.1" clean: rm -r "ponysaytruncater" -- cgit From 9b2e85c10d3dc7ad1142b95e49aeb4d8e6757b02 Mon Sep 17 00:00:00 2001 From: Erkin Batu Altunbaş Date: Wed, 11 Jul 2012 18:49:45 +0300 Subject: A binary executable isn't a directory. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e9c3279..502f1b4 100644 --- a/Makefile +++ b/Makefile @@ -41,4 +41,4 @@ uninstall: unlink "$(DESTDIR)/usr/share/man/man1/ponythink.1" clean: - rm -r "ponysaytruncater" + rm "ponysaytruncater" -- cgit From fc3d2d660a95244f11fa7bbb9a004a13e7f3cda0 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 12 Jul 2012 16:59:18 +0300 Subject: The manpage is currently in section 6, not section 1 (issue #22 is open) --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 502f1b4..ca6a5e1 100644 --- a/Makefile +++ b/Makefile @@ -25,8 +25,8 @@ install: all install "COPYING" "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" mkdir -p "$(DESTDIR)/usr/share/man/man1" - install "manpage.1" "$(DESTDIR)/usr/share/man/man1/ponysay.1" - ln -sf "ponysay.1" "$(DESTDIR)/usr/share/man/man1/ponythink.1" + install "manpage.6" "$(DESTDIR)/usr/share/man/man1/ponysay.6" + ln -sf "ponysay.6" "$(DESTDIR)/usr/share/man/man1/ponythink.6" uninstall: rm -fr "$(DESTDIR)/usr/share/ponysay/ponies" @@ -37,8 +37,8 @@ uninstall: unlink "$(DESTDIR)/usr/share/zsh/site-functions/_ponysay"; unlink "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" unlink "$(DESTDIR)/usr/share/bash-completion/completions/ponysay" - unlink "$(DESTDIR)/usr/share/man/man1/ponysay.1" - unlink "$(DESTDIR)/usr/share/man/man1/ponythink.1" + unlink "$(DESTDIR)/usr/share/man/man1/ponysay.6" + unlink "$(DESTDIR)/usr/share/man/man1/ponythink.6" clean: rm "ponysaytruncater" -- cgit From 3347fa84c3dbab2b40ef683df2d7a57d548db2cc Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 12 Jul 2012 16:59:47 +0300 Subject: missed one line --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ca6a5e1..079092e 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ install: all mkdir -p "$(DESTDIR)/usr/share/licenses/ponysay/" install "COPYING" "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" - mkdir -p "$(DESTDIR)/usr/share/man/man1" + mkdir -p "$(DESTDIR)/usr/share/man/man6" install "manpage.6" "$(DESTDIR)/usr/share/man/man1/ponysay.6" ln -sf "ponysay.6" "$(DESTDIR)/usr/share/man/man1/ponythink.6" -- cgit From 9f4f748cf95407ba9fd4d8a8c347d735fab1416e Mon Sep 17 00:00:00 2001 From: Erkin Batu Altunbaş Date: Thu, 12 Jul 2012 17:07:22 +0300 Subject: ponysaytruncater seems to be writeprotected. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 079092e..e5b870f 100644 --- a/Makefile +++ b/Makefile @@ -41,4 +41,4 @@ uninstall: unlink "$(DESTDIR)/usr/share/man/man1/ponythink.6" clean: - rm "ponysaytruncater" + rm -f "ponysaytruncater" -- cgit From dbfb357d7cea1732786c7cd49211910cc84e7e43 Mon Sep 17 00:00:00 2001 From: Erkin Batu Altunbaş Date: Thu, 12 Jul 2012 19:06:41 +0200 Subject: makefile mistake man1 instead of man6 --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e5b870f..eac642f 100644 --- a/Makefile +++ b/Makefile @@ -25,8 +25,8 @@ install: all install "COPYING" "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" mkdir -p "$(DESTDIR)/usr/share/man/man6" - install "manpage.6" "$(DESTDIR)/usr/share/man/man1/ponysay.6" - ln -sf "ponysay.6" "$(DESTDIR)/usr/share/man/man1/ponythink.6" + install "manpage.6" "$(DESTDIR)/usr/share/man/man6/ponysay.6" + ln -sf "ponysay.6" "$(DESTDIR)/usr/share/man/man6/ponythink.6" uninstall: rm -fr "$(DESTDIR)/usr/share/ponysay/ponies" @@ -37,8 +37,8 @@ uninstall: unlink "$(DESTDIR)/usr/share/zsh/site-functions/_ponysay"; unlink "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" unlink "$(DESTDIR)/usr/share/bash-completion/completions/ponysay" - unlink "$(DESTDIR)/usr/share/man/man1/ponysay.6" - unlink "$(DESTDIR)/usr/share/man/man1/ponythink.6" + unlink "$(DESTDIR)/usr/share/man/man6/ponysay.6" + unlink "$(DESTDIR)/usr/share/man/man6/ponythink.6" clean: rm -f "ponysaytruncater" -- cgit From 7cd5fdbc8de6e51ca48585427669b402f6108bf9 Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Date: Thu, 12 Jul 2012 20:01:22 -0400 Subject: move spanish manpages to man6 --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2fff65f..11aa004 100644 --- a/Makefile +++ b/Makefile @@ -29,8 +29,8 @@ install: all ln -sf "ponysay.1" "$(DESTDIR)/usr/share/man/man1/ponythink.1" mkdir -p "$(DESTDIR)/usr/share/man/es/man1" - install "manpage.es.1" "$(DESTDIR)/usr/share/man/es/man1/ponysay.1" - ln -sf "ponysay.1" "$(DESTDIR)/usr/share/man/es/man1/ponythink.1" + install "manpage.es.1" "$(DESTDIR)/usr/share/man/es/man1/ponysay.6" + ln -sf "ponysay.6" "$(DESTDIR)/usr/share/man/es/man1/ponythink.6" uninstall: rm -fr "$(DESTDIR)/usr/share/ponysay/ponies" @@ -43,7 +43,7 @@ uninstall: unlink "$(DESTDIR)/usr/share/bash-completion/completions/ponysay" unlink "$(DESTDIR)/usr/share/man/man1/ponysay.1" unlink "$(DESTDIR)/usr/share/man/man1/ponythink.1" - unlink "$(DESTDIR)/usr/share/man/es/man1/ponysay.1" - unlink "$(DESTDIR)/usr/share/man/es/man1/ponysay.1" + unlink "$(DESTDIR)/usr/share/man/es/man1/ponysay.6" + unlink "$(DESTDIR)/usr/share/man/es/man1/ponythink.6" clean: rm -r "ponysaytruncater" -- cgit From 0fec12a59faa1a605b8b53c97f064316a0b6432a Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Date: Thu, 12 Jul 2012 22:50:34 -0400 Subject: Fix mistaken in man6 for man1 in manpage spanish --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 11aa004..737b82e 100644 --- a/Makefile +++ b/Makefile @@ -28,9 +28,9 @@ install: all install "manpage.1" "$(DESTDIR)/usr/share/man/man1/ponysay.1" ln -sf "ponysay.1" "$(DESTDIR)/usr/share/man/man1/ponythink.1" - mkdir -p "$(DESTDIR)/usr/share/man/es/man1" - install "manpage.es.1" "$(DESTDIR)/usr/share/man/es/man1/ponysay.6" - ln -sf "ponysay.6" "$(DESTDIR)/usr/share/man/es/man1/ponythink.6" + mkdir -p "$(DESTDIR)/usr/share/man/es/man6" + install "manpage.es.1" "$(DESTDIR)/usr/share/man/es/man6/ponysay.6" + ln -sf "ponysay.6" "$(DESTDIR)/usr/share/man/es/man6/ponythink.6" uninstall: rm -fr "$(DESTDIR)/usr/share/ponysay/ponies" @@ -43,7 +43,7 @@ uninstall: unlink "$(DESTDIR)/usr/share/bash-completion/completions/ponysay" unlink "$(DESTDIR)/usr/share/man/man1/ponysay.1" unlink "$(DESTDIR)/usr/share/man/man1/ponythink.1" - unlink "$(DESTDIR)/usr/share/man/es/man1/ponysay.6" - unlink "$(DESTDIR)/usr/share/man/es/man1/ponythink.6" + unlink "$(DESTDIR)/usr/share/man/es/man6/ponysay.6" + unlink "$(DESTDIR)/usr/share/man/es/man6/ponythink.6" clean: rm -r "ponysaytruncater" -- cgit From 72e57e0242527bdb6e184e5f5cec7ccc71493daa Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Date: Thu, 12 Jul 2012 23:54:38 -0400 Subject: Fix spanish manpage install mistake --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ceb58b9..8e9a662 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ install: all ln -sf "ponysay.6" "$(DESTDIR)/usr/share/man/man6/ponythink.6" mkdir -p "$(DESTDIR)/usr/share/man/es/man6" - install "manpage.es.1" "$(DESTDIR)/usr/share/man/es/man6/ponysay.6" + install "manpage.es.6" "$(DESTDIR)/usr/share/man/es/man6/ponysay.6" ln -sf "ponysay.6" "$(DESTDIR)/usr/share/man/es/man6/ponythink.6" uninstall: @@ -45,7 +45,5 @@ uninstall: unlink "$(DESTDIR)/usr/share/man/man6/ponythink.6" unlink "$(DESTDIR)/usr/share/man/es/man6/ponysay.6" unlink "$(DESTDIR)/usr/share/man/es/man6/ponythink.6" - ->>>>>>> upstream/master clean: rm -f "ponysaytruncater" -- cgit From bd09bbc44d2b217a019b9f84e53e785bea13f660 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 13 Jul 2012 12:22:33 +0200 Subject: Moved manpages to separate directory: manuals --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8e9a662..3fb7dcd 100644 --- a/Makefile +++ b/Makefile @@ -25,11 +25,11 @@ install: all install "COPYING" "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" mkdir -p "$(DESTDIR)/usr/share/man/man6" - install "manpage.6" "$(DESTDIR)/usr/share/man/man6/ponysay.6" + install "manuals/manpage.6" "$(DESTDIR)/usr/share/man/man6/ponysay.6" ln -sf "ponysay.6" "$(DESTDIR)/usr/share/man/man6/ponythink.6" mkdir -p "$(DESTDIR)/usr/share/man/es/man6" - install "manpage.es.6" "$(DESTDIR)/usr/share/man/es/man6/ponysay.6" + install "manuals/manpage.es.6" "$(DESTDIR)/usr/share/man/es/man6/ponysay.6" ln -sf "ponysay.6" "$(DESTDIR)/usr/share/man/es/man6/ponythink.6" uninstall: -- cgit From 24f52c0e3196d4dbfb4a3c8b32d29a10ad021dac Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sun, 15 Jul 2012 01:01:50 +0200 Subject: dezebraised and non-kms-comp. ttyponies + auto building of ttyponies --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3fb7dcd..52277e1 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,10 @@ all: ponysaytruncater ponysaytruncater: gcc -o "ponysaytruncater" "ponysaytruncater.c" +ttyponies: + mkdir -p ttyponies + ./ttyponies.sh + install: all mkdir -p "$(DESTDIR)/usr/share/ponysay/" mkdir -p "$(DESTDIR)/usr/share/ponysay/ponies" -- cgit From 96661759901c2e8a9110bb93574c0b33743b65e7 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Mon, 16 Jul 2012 16:15:56 +0200 Subject: Makefile gzip compresses manpages --- Makefile | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 52277e1..598767d 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,12 @@ -all: ponysaytruncater +all: ponysaytruncater manpages 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 + ttyponies: mkdir -p ttyponies ./ttyponies.sh @@ -29,12 +33,12 @@ install: all install "COPYING" "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" mkdir -p "$(DESTDIR)/usr/share/man/man6" - install "manuals/manpage.6" "$(DESTDIR)/usr/share/man/man6/ponysay.6" - ln -sf "ponysay.6" "$(DESTDIR)/usr/share/man/man6/ponythink.6" + install "manuals/manpage.6.gz" "$(DESTDIR)/usr/share/man/man6/ponysay.6.gz" + ln -sf "ponysay.6.gz" "$(DESTDIR)/usr/share/man/man6/ponythink.6.gz" mkdir -p "$(DESTDIR)/usr/share/man/es/man6" - install "manuals/manpage.es.6" "$(DESTDIR)/usr/share/man/es/man6/ponysay.6" - ln -sf "ponysay.6" "$(DESTDIR)/usr/share/man/es/man6/ponythink.6" + 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" uninstall: rm -fr "$(DESTDIR)/usr/share/ponysay/ponies" @@ -45,9 +49,13 @@ uninstall: unlink "$(DESTDIR)/usr/share/zsh/site-functions/_ponysay"; unlink "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" unlink "$(DESTDIR)/usr/share/bash-completion/completions/ponysay" - unlink "$(DESTDIR)/usr/share/man/man6/ponysay.6" - unlink "$(DESTDIR)/usr/share/man/man6/ponythink.6" - unlink "$(DESTDIR)/usr/share/man/es/man6/ponysay.6" - unlink "$(DESTDIR)/usr/share/man/es/man6/ponythink.6" + unlink "$(DESTDIR)/usr/share/man/man6/ponysay.6.gz" + 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" + clean: rm -f "ponysaytruncater" + rm manuals/manpage.6.gz + rm manuals/manpage.es.6.gz + -- cgit