diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2011-01-08 07:44:13 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2011-01-08 07:44:13 +0000 |
| commit | 60a2516c48cff8f7a191d8ee5a7e8d4cb62cf1cc (patch) | |
| tree | 6b6cd65d1f14eed0dac4f84ee3d9a2a2fa981e27 /eclass | |
| parent | Bug #348363: need to bump inherit line for newer PHP eclasses. Revbump so tha... (diff) | |
| download | gentoo-2-60a2516c48cff8f7a191d8ee5a7e8d4cb62cf1cc.tar.gz gentoo-2-60a2516c48cff8f7a191d8ee5a7e8d4cb62cf1cc.tar.bz2 gentoo-2-60a2516c48cff8f7a191d8ee5a7e8d4cb62cf1cc.zip | |
Use $(get_libdir) when installing to rcscripts. (bug #262845)
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index f116e85c2806..eda551b9d9ab 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -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 <toolchain@gentoo.org> @@ -872,11 +872,11 @@ gcc-compiler_pkg_postinst() { 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)/rcscripts/awk/ || die "installing fixlafiles.awk" cp "${ROOT}/${DATAPATH}"/fix_libtool_files.sh "${ROOT}"/sbin/ || die "installing fix_libtool_files.sh" [[ ! -d ${ROOT}/usr/bin ]] \ @@ -894,7 +894,7 @@ gcc-compiler_pkg_postinst() { 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 } gcc-compiler_pkg_postrm() { |