[gentoo-commits] repo/gentoo:master commit in: sys-libs/libsepol/

[James Le Cuirot]

commit:     490e126ae54a5192c9447158a6aeec608c065fed
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 19 09:33:09 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Jul 19 09:57:00 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=490e126a

sys-libs/libsepol: Fix installation on prefix for 3.7

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 sys-libs/libsepol/libsepol-3.7.ebuild  | 17 ++++++++++-------
 sys-libs/libsepol/libsepol-9999.ebuild | 17 ++++++++++-------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/sys-libs/libsepol/libsepol-3.7.ebuild 
b/sys-libs/libsepol/libsepol-3.7.ebuild
index 4cb9db630532..3266c276a3fa 100644
--- a/sys-libs/libsepol/libsepol-3.7.ebuild
+++ b/sys-libs/libsepol/libsepol-3.7.ebuild
@@ -32,19 +32,22 @@ src_prepare() {
        multilib_copy_sources
 }
 
+my_make() {
+       emake \
+               PREFIX="${EPREFIX}/usr" \
+               LIBDIR="\$(PREFIX)/$(get_libdir)" \
+               SHLIBDIR="${EPREFIX}/$(get_libdir)" \
+               "${@}"
+}
+
 multilib_src_compile() {
        tc-export CC AR RANLIB
 
        local -x CFLAGS="${CFLAGS} -fno-semantic-interposition"
 
-       emake \
-               LIBDIR="\$(PREFIX)/$(get_libdir)" \
-               SHLIBDIR="/$(get_libdir)"
+       my_make
 }
 
 multilib_src_install() {
-       emake DESTDIR="${D}" \
-               LIBDIR="\$(PREFIX)/$(get_libdir)" \
-               SHLIBDIR="/$(get_libdir)" \
-               install
+       my_make DESTDIR="${D}" install
 }

diff --git a/sys-libs/libsepol/libsepol-9999.ebuild 
b/sys-libs/libsepol/libsepol-9999.ebuild
index 4cb9db630532..3266c276a3fa 100644
--- a/sys-libs/libsepol/libsepol-9999.ebuild
+++ b/sys-libs/libsepol/libsepol-9999.ebuild
@@ -32,19 +32,22 @@ src_prepare() {
        multilib_copy_sources
 }
 
+my_make() {
+       emake \
+               PREFIX="${EPREFIX}/usr" \
+               LIBDIR="\$(PREFIX)/$(get_libdir)" \
+               SHLIBDIR="${EPREFIX}/$(get_libdir)" \
+               "${@}"
+}
+
 multilib_src_compile() {
        tc-export CC AR RANLIB
 
        local -x CFLAGS="${CFLAGS} -fno-semantic-interposition"
 
-       emake \
-               LIBDIR="\$(PREFIX)/$(get_libdir)" \
-               SHLIBDIR="/$(get_libdir)"
+       my_make
 }
 
 multilib_src_install() {
-       emake DESTDIR="${D}" \
-               LIBDIR="\$(PREFIX)/$(get_libdir)" \
-               SHLIBDIR="/$(get_libdir)" \
-               install
+       my_make DESTDIR="${D}" install
 }