diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2010-10-27 07:42:07 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2010-10-27 07:42:07 +0000 |
| commit | 8e348af50980ca4daaeb9ca1dba09f06d324c3cb (patch) | |
| tree | 2910a39639948b4a406c3c63db0542f2f97cd7f5 /dev-vcs | |
| parent | Support building Prolog kernel with -DO_DEBUG. Closes #342383 (diff) | |
| download | gentoo-2-8e348af50980ca4daaeb9ca1dba09f06d324c3cb.tar.gz gentoo-2-8e348af50980ca4daaeb9ca1dba09f06d324c3cb.tar.bz2 gentoo-2-8e348af50980ca4daaeb9ca1dba09f06d324c3cb.zip | |
Bug #342845: fix contrib install and doman warning.
(Portage version: 2.2_rc98/cvs/Linux x86_64)
Diffstat (limited to 'dev-vcs')
| -rw-r--r-- | dev-vcs/git/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-vcs/git/git-1.7.3.2-r1.ebuild | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog index 1eed951f33df..4ef7772c8ecb 100644 --- a/dev-vcs/git/ChangeLog +++ b/dev-vcs/git/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-vcs/git # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.41 2010/10/26 21:06:34 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.42 2010/10/27 07:42:07 robbat2 Exp $ + + 27 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.7.3.2-r1.ebuild: + Bug #342845: fix contrib install and doman warning. *git-1.7.3.2-r1 (26 Oct 2010) diff --git a/dev-vcs/git/git-1.7.3.2-r1.ebuild b/dev-vcs/git/git-1.7.3.2-r1.ebuild index 978e5b90b650..4998e7dbe611 100644 --- a/dev-vcs/git/git-1.7.3.2-r1.ebuild +++ b/dev-vcs/git/git-1.7.3.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.2-r1.ebuild,v 1.1 2010/10/26 21:06:34 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.2-r1.ebuild,v 1.2 2010/10/27 07:42:07 robbat2 Exp $ EAPI=3 @@ -271,7 +271,10 @@ src_install() { install || \ die "make install failed" - doman man?/*.[157] Documentation/*.[157] + # Depending on the tarball and manual rebuild of the documentation, the + # manpages may exist in either OR both of these directories. + find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] + find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] dodoc README Documentation/{SubmittingPatches,CodingGuidelines} use doc && dodir /usr/share/doc/${PF}/html @@ -318,8 +321,8 @@ src_install() { # thunderbird-patch-inline - fixes thunderbird for i in \ blameview buildsystems ciabot continuous convert-objects fast-import \ - git-shell-commands hg-to-git hooks remotes2config.sh remotes2config.sh \ - rerere-train.sh stats svn-fe vim workdir \ + hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ + stats svn-fe vim workdir \ ; do cp -rf \ "${S}"/contrib/${i} \ |