diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-12-29 09:46:46 +0100 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-12-29 09:46:46 +0100 |
| commit | 048475e1b21f7bad163f4bf14a4b585942973c79 (patch) | |
| tree | 29488dd16d11aabcab9594da7454903ceedef86d /eclass | |
| parent | [x-modular-r2] prefix updates (diff) | |
| download | x11-048475e1b21f7bad163f4bf14a4b585942973c79.tar.gz x11-048475e1b21f7bad163f4bf14a4b585942973c79.tar.bz2 x11-048475e1b21f7bad163f4bf14a4b585942973c79.zip | |
[font] Prefix support++
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/font.eclass | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/eclass/font.eclass b/eclass/font.eclass index b4c36d1c..f4a2a7c6 100644 --- a/eclass/font.eclass +++ b/eclass/font.eclass @@ -19,7 +19,6 @@ case ${EAPI:-0} in 0|1|2) if ! use prefix; then EPREFIX= - ED=${D} EROOT=${ROOT} [[ ${EROOT} = */ ]] || EROOT+="/" fi @@ -72,12 +71,12 @@ font_xfont_config() { # create Xfont files if has X ${IUSE//+} && use X ; then ebegin "Creating fonts.scale & fonts.dir" - rm -f "${ED}${FONTDIR}"/fonts.{dir,scale} - mkfontscale "${ED}${FONTDIR}" + rm -f "${D}${FONTDIR}"/fonts.{dir,scale} + mkfontscale "${D}${FONTDIR}" mkfontdir \ -e ${EPREFIX}/usr/share/fonts/encodings \ -e ${EPREFIX}/usr/share/fonts/encodings/large \ - "${ED}${FONTDIR}" + "${D}${FONTDIR}" eend $? if [ -e "${FONT_S}/fonts.alias" ] ; then doins "${FONT_S}/fonts.alias" @@ -91,7 +90,7 @@ font_xfont_config() { font_xft_config() { # create fontconfig cache ebegin "Creating fontconfig cache" - fc-cache -sf "${ED}${FONTDIR}" + fc-cache -sf "${D}${FONTDIR}" eend $? } |