From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PbTTM-0006pA-10 for garchives@archives.gentoo.org; Sat, 08 Jan 2011 07:44:24 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA47BE06A1; Sat, 8 Jan 2011 07:44:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 738C3E06A1 for ; Sat, 8 Jan 2011 07:44:15 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C1D561B4074 for ; Sat, 8 Jan 2011 07:44:14 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2145) id 5AF0F20051; Sat, 8 Jan 2011 07:44:13 +0000 (UTC) From: "Ryan Hill (dirtyepic)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, dirtyepic@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: toolchain.eclass X-VCS-Directories: eclass X-VCS-Committer: dirtyepic X-VCS-Committer-Name: Ryan Hill Content-Type: text/plain; charset=utf8 Message-Id: <20110108074413.5AF0F20051@flycatcher.gentoo.org> Date: Sat, 8 Jan 2011 07:44:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: e1dae9dd-9e9d-4829-afb5-17d4a945af1e X-Archives-Hash: 4335a97b111cf895309b7d35d040c3ad dirtyepic 11/01/08 07:44:13 Modified: toolchain.eclass Log: Use $(get_libdir) when installing to rcscripts. (bug #262845) Revision Changes Path 1.446 eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.e= class?rev=3D1.446&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.e= class?rev=3D1.446&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.e= class?r1=3D1.445&r2=3D1.446 Index: toolchain.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.445 retrieving revision 1.446 diff -u -r1.445 -r1.446 --- toolchain.eclass 6 Jan 2011 23:22:37 -0000 1.445 +++ toolchain.eclass 8 Jan 2011 07:44:13 -0000 1.446 @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.445 2011/= 01/06 23:22:37 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.446 2011/= 01/08 07:44:13 dirtyepic Exp $ # # Maintainer: Toolchain Ninjas =20 @@ -872,11 +872,11 @@ =20 if ! is_crosscompile ; then # hack to prevent collisions between SLOT - [[ ! -d ${ROOT}/lib/rcscripts/awk ]] \ - && mkdir -p "${ROOT}"/lib/rcscripts/awk + [[ ! -d ${ROOT}/$(get_libdir)/rcscripts/awk ]] \ + && mkdir -p "${ROOT}"/$(get_libdir)/rcscripts/awk [[ ! -d ${ROOT}/sbin ]] \ && mkdir -p "${ROOT}"/sbin - cp "${ROOT}/${DATAPATH}"/fixlafiles.awk "${ROOT}"/lib/rcscripts/awk/ |= | die "installing fixlafiles.awk" + cp "${ROOT}/${DATAPATH}"/fixlafiles.awk "${ROOT}"/$(get_libdir)/rcscri= pts/awk/ || die "installing fixlafiles.awk" cp "${ROOT}/${DATAPATH}"/fix_libtool_files.sh "${ROOT}"/sbin/ || die "= installing fix_libtool_files.sh" =20 [[ ! -d ${ROOT}/usr/bin ]] \ @@ -894,7 +894,7 @@ gcc-compiler_pkg_prerm() { # Don't let these files be uninstalled #87647 touch -c "${ROOT}"/sbin/fix_libtool_files.sh \ - "${ROOT}"/lib/rcscripts/awk/fixlafiles.awk + "${ROOT}"/$(get_libdir)/rcscripts/awk/fixlafiles.awk } =20 gcc-compiler_pkg_postrm() {