diff options
author | Pablo Lezaeta <prflr88@gmail.com> | 2012-07-12 23:52:06 -0400 |
---|---|---|
committer | Pablo Lezaeta <prflr88@gmail.com> | 2012-07-12 23:52:06 -0400 |
commit | acec0f2d7a0eec12be24e2089608e92b461cd65b (patch) | |
tree | 63d87c242d125a5685641d7fbcdccac7c0d080f7 /Makefile | |
parent | b759a958c796f2d0b56dc76045dd62ebc8509a32 (diff) | |
parent | 0d7cbc70d75169e5debbe5c67b4eb8773835dd80 (diff) | |
download | ponysay-acec0f2d7a0eec12be24e2089608e92b461cd65b.tar.gz ponysay-acec0f2d7a0eec12be24e2089608e92b461cd65b.tar.bz2 ponysay-acec0f2d7a0eec12be24e2089608e92b461cd65b.zip |
Fix conflict in makefile for spnish translation for manpages
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -24,9 +24,9 @@ install: all mkdir -p "$(DESTDIR)/usr/share/licenses/ponysay/" 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" + mkdir -p "$(DESTDIR)/usr/share/man/man6" + install "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.1" "$(DESTDIR)/usr/share/man/es/man6/ponysay.6" @@ -41,9 +41,11 @@ 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/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" + +>>>>>>> upstream/master clean: - rm -r "ponysaytruncater" + rm -f "ponysaytruncater" |