diff options
author | Martin Mokrejš <mmokrejs@gmail.com> | 2017-01-27 11:33:30 +0100 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2017-01-27 14:11:13 -0800 |
commit | b7bb930838f049041c51e3763bb4a9fc7f5be0be (patch) | |
tree | b64e826df25809cc17429001a8c7d293dd01758b /sys-libs/db/db-4.4.20_p4-r1.ebuild | |
parent | sys-libs/db: fix ebuilds for recent versions to respect EPREFIX (diff) | |
download | gentoo-b7bb930838f049041c51e3763bb4a9fc7f5be0be.tar.gz gentoo-b7bb930838f049041c51e3763bb4a9fc7f5be0be.tar.bz2 gentoo-b7bb930838f049041c51e3763bb4a9fc7f5be0be.zip |
sys-libs/db: respect EPREFIX, fixes bug #587520
(cherry picked from commit 6eab44c650e8134e1b3025a197cb77057d2925d5)
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Fixes: https://github.com/gentoo/gentoo/pull/3671
Diffstat (limited to 'sys-libs/db/db-4.4.20_p4-r1.ebuild')
-rw-r--r-- | sys-libs/db/db-4.4.20_p4-r1.ebuild | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sys-libs/db/db-4.4.20_p4-r1.ebuild b/sys-libs/db/db-4.4.20_p4-r1.ebuild index 16d94fee3767..34b7a9a8bd05 100644 --- a/sys-libs/db/db-4.4.20_p4-r1.ebuild +++ b/sys-libs/db/db-4.4.20_p4-r1.ebuild @@ -114,13 +114,13 @@ src_compile() { fi cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --datadir=/usr/share \ - --sysconfdir=/etc \ - --localstatedir=/var/lib \ - --libdir=/usr/"$(get_libdir)" \ + --prefix="${EPREFIX}"/usr \ + --mandir="${EPREFIX}"/usr/share/man \ + --infodir="${EPREFIX}"/usr/share/info \ + --datadir="${EPREFIX}"/usr/share \ + --sysconfdir="${EPREFIX}"/etc \ + --localstatedir="${EPREFIX}"/var/lib \ + --libdir="${EPREFIX}"/usr/"$(get_libdir)" \ --enable-compat185 \ --enable-o_direct \ --without-uniquename \ @@ -132,7 +132,7 @@ src_compile() { } src_install() { - einstall libdir="${D}/usr/$(get_libdir)" strip="${D}/bin/strip" || die + einstall libdir="${ED}/usr/$(get_libdir)" strip="${ED}/bin/strip" || die db_src_install_usrbinslot @@ -144,13 +144,13 @@ src_install() { dodir /usr/sbin # This file is not always built, and no longer exists as of db-4.8 - [[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \ - mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc + [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] && \ + mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc if use java; then - java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar - rm -f "${D}"/usr/"$(get_libdir)"/*.jar + java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so + java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar + rm -f "${ED}"/usr/"$(get_libdir)"/*.jar fi } |