diff options
author | Patrick Lauer <patrick@gentoo.org> | 2013-04-08 03:37:07 +0000 |
---|---|---|
committer | Patrick Lauer <patrick@gentoo.org> | 2013-04-08 03:37:07 +0000 |
commit | 359c97308daf5c31f33863c60ac611804bc073bb (patch) | |
tree | 94c5b13354fcf62aaa86eb1f313d00e6ae33770d /eclass | |
parent | more fixes, maybe this makes everyone happy? who knows (diff) | |
download | gentoo-2-359c97308daf5c31f33863c60ac611804bc073bb.tar.gz gentoo-2-359c97308daf5c31f33863c60ac611804bc073bb.tar.bz2 gentoo-2-359c97308daf5c31f33863c60ac611804bc073bb.zip |
Fix for gcc info page installation #464008
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/ChangeLog | 5 | ||||
-rw-r--r-- | eclass/toolchain.eclass | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 09dea96b4cf8..54e04704a2bc 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.775 2013/04/07 21:14:46 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.776 2013/04/08 03:37:07 patrick Exp $ + + 08 Apr 2013; Patrick Lauer <patrick@gentoo.org> toolchain.eclass: + Fix for gcc info page installation #464008 07 Apr 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass: Remove wrong sed on QT_INSTALL_{LIBS,PLUGINS}. See bug 304971 comments 16-18. diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index ceda93af4437..7e820bb1d4db 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.578 2013/04/07 18:27:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.579 2013/04/08 03:37:07 patrick Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -1499,7 +1499,7 @@ toolchain_src_install() { # Copy over the info pages. We disabled their generation earlier, but the # build system only expects to install out of the build dir, not the source. #464008 mkdir -p gcc/doc - cp "${S}"/gcc/doc/*.info* gcc/doc/ || die + cp "${WORKDIR}/${P}"/gcc/doc/*.info* gcc/doc/ || die # Remove generated headers, as they can cause things to break # (ncurses, openssl, etc). while read x ; do |