diff options
| author |   Horea Christian <horea.christ@yandex.com> | 2017-08-14 19:33:17 +0200 |
|---|---|---|
| committer |   Amy Liffey <amynka@gentoo.org> | 2017-08-15 13:36:55 +0200 |
| commit | 944e17caad889864e4884040355e3fd98e74f7b7 (patch) | |
| tree | eea3b1ab39f68e657daee15d4da564e4dd461500 | |
| parent | x11-wm/windowlab: EAPI 6 bump (diff) | |
| download | gentoo-944e17caad889864e4884040355e3fd98e74f7b7.tar.gz gentoo-944e17caad889864e4884040355e3fd98e74f7b7.tar.bz2 gentoo-944e17caad889864e4884040355e3fd98e74f7b7.zip | |
dev-lang/fpc: using ${ED} for prefix/RAP compatibility
Package-Manager: Portage-2.3.6, Repoman-2.3.3
Closes:#5419
| -rw-r--r-- | dev-lang/fpc/fpc-3.0.2.ebuild | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/dev-lang/fpc/fpc-3.0.2.ebuild b/dev-lang/fpc/fpc-3.0.2.ebuild index 41b229acda54..f8ea1b5b8b4c 100644 --- a/dev-lang/fpc/fpc-3.0.2.ebuild +++ b/dev-lang/fpc/fpc-3.0.2.ebuild @@ -107,10 +107,10 @@ src_install() { #${WORKDIR}/${PN}build-${PV}/utils/fpcm/fpcmake" #fpcbuild-3.0.0/fpcsrc/utils/fpcm/bin/x86_64-linux/fpcmake set -- PP="${pp}" FPCMAKE="${S}/utils/fpcm/bin/${FPC_PARCH}-linux/fpcmake" \ - INSTALL_PREFIX="${D}"/usr \ - INSTALL_DOCDIR="${D}"/usr/share/doc/${PF} \ - INSTALL_MANDIR="${D}"/usr/share/man \ - INSTALL_SOURCEDIR="${D}"/usr/lib/fpc/${PV}/source + INSTALL_PREFIX="${ED}"/usr \ + INSTALL_DOCDIR="${ED}"/usr/share/doc/${PF} \ + INSTALL_MANDIR="${ED}"/usr/share/man \ + INSTALL_SOURCEDIR="${ED}"/usr/lib/fpc/${PV}/source emake -j1 "$@" compiler_install rtl_install packages_install utils_install @@ -135,23 +135,23 @@ src_install() { if use source ; then cd "${S}" || die shift - emake -j1 PP="${D}"/usr/bin/ppc${FPC_ARCH} "$@" sourceinstall - find "${D}"/usr/lib/fpc/${PV}/source -name '*.o' -exec rm {} \; + emake -j1 PP="${ED}"/usr/bin/ppc${FPC_ARCH} "$@" sourceinstall + find "${ED}"/usr/lib/fpc/${PV}/source -name '*.o' -exec rm {} \; fi - "${D}"/usr/lib/fpc/${PV}/samplecfg "${D}"/usr/lib/fpc/${PV} "${D}"/etc || die + "${ED}"/usr/lib/fpc/${PV}/samplecfg "${ED}"/usr/lib/fpc/${PV} "${ED}"/etc || die - sed -i "s:${D}::g" "${D}"/etc/fpc.cfg || die + sed -i "s:${ED}::g" "${ED}"/etc/fpc.cfg || die if use ide ; then - sed -e "s:${D}::g" \ - -i "${D}"/etc/fppkg.cfg \ - -i "${D}"/etc/fppkg/* \ - -i "${D}"/usr/lib/fpc/${PV}/ide/text/fp*.cfg \ + sed -e "s:${ED}::g" \ + -i "${ED}"/etc/fppkg.cfg \ + -i "${ED}"/etc/fppkg/* \ + -i "${ED}"/usr/lib/fpc/${PV}/ide/text/fp*.cfg \ || die fi - rm -r "${D}"/usr/lib/fpc/lexyacc || die + rm -r "${ED}"/usr/lib/fpc/lexyacc || die } pkg_postinst() { |