commit: b0874f66ad6380825b69309eb6deb5c69c345912
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 15:38:06 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 15:40:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0874f66
sys-fs/multipath-tools: pass usr_prefix to make
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
...ltipath-tools-0.9.4.ebuild => multipath-tools-0.9.4-r1.ebuild} | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.4.ebuild
b/sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild
similarity index 88%
rename from sys-fs/multipath-tools/multipath-tools-0.9.4.ebuild
rename to sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild
index a0a952eec775..8fbf1e4ee6b4 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.4.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild
@@ -39,12 +39,12 @@ PATCHES=(
myemake() {
local myemakeargs=(
prefix="${EPREFIX}"
+ usr_prefix="${EPREFIX}/usr"
LIB="$(get_libdir)"
RUN=run
plugindir="${EPREFIX}/$(get_libdir)/multipath"
unitdir="$(systemd_get_systemunitdir)"
- libudevdir="${EPREFIX}/$(get_udevdir)"
- pkgconfdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
+ libudevdir="${EPREFIX}$(get_udevdir)"
GENTOO_CFLAGS="${CFLAGS}"
GENTOO_CPPFLAGS="${CPPFLAGS}"
FAKEVAR=1
@@ -78,10 +78,6 @@ src_install() {
myemake DESTDIR="${ED}" install
- rmdir "${ED}"/usr/include
- rmdir "${ED}"/usr/share
- mv "${ED}"/include "${ED}"/usr/include || die
- mv "${ED}"/share "${ED}"/usr/share || die
einstalldocs
newinitd "${FILESDIR}"/multipathd-r1.rc multipathd
