commit:     eb8a99321f0bef37ad1b9a39876b61c9dec33150
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 16:23:48 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 16:23:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb8a9932

sys-fs/lvm2: pass SYSTEMD_GENERATOR_DIR to make install

Passing systemdutildir does not work because it is a configure variable,
not a make variable.

Closes: https://bugs.gentoo.org/840577
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-fs/lvm2/{lvm2-2.02.188-r2.ebuild => lvm2-2.02.188-r3.ebuild} | 2 +-
 sys-fs/lvm2/{lvm2-2.03.14-r1.ebuild => lvm2-2.03.14-r2.ebuild}   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild 
b/sys-fs/lvm2/lvm2-2.02.188-r3.ebuild
similarity index 98%
rename from sys-fs/lvm2/lvm2-2.02.188-r2.ebuild
rename to sys-fs/lvm2/lvm2-2.02.188-r3.ebuild
index a3e76755f1d5..50111c5fabb3 100644
--- a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.188-r3.ebuild
@@ -210,7 +210,7 @@ src_install() {
        local inst
        local INSTALL_TARGETS=( install install_tmpfiles_configuration )
        # install systemd related files only when requested, bug #522430
-       use systemd && INSTALL_TARGETS+=( 
systemdutildir="$(systemd_get_utildir)" install_systemd_units 
install_systemd_generators )
+       use systemd && INSTALL_TARGETS+=( 
SYSTEMD_GENERATOR_DIR="$(systemd_get_systemgeneratordir)" install_systemd_units 
install_systemd_generators )
        use device-mapper-only && INSTALL_TARGETS=( install_device-mapper )
        emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}"
 

diff --git a/sys-fs/lvm2/lvm2-2.03.14-r1.ebuild 
b/sys-fs/lvm2/lvm2-2.03.14-r2.ebuild
similarity index 98%
rename from sys-fs/lvm2/lvm2-2.03.14-r1.ebuild
rename to sys-fs/lvm2/lvm2-2.03.14-r2.ebuild
index 66b2184868ed..2da81764efe4 100644
--- a/sys-fs/lvm2/lvm2-2.03.14-r1.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.14-r2.ebuild
@@ -212,7 +212,7 @@ src_install() {
        local inst
        local INSTALL_TARGETS=( install install_tmpfiles_configuration )
        # install systemd related files only when requested, bug #522430
-       use systemd && INSTALL_TARGETS+=( 
systemdutildir="$(systemd_get_utildir)" install_systemd_units 
install_systemd_generators )
+       use systemd && INSTALL_TARGETS+=( 
SYSTEMD_GENERATOR_DIR="$(systemd_get_systemgeneratordir)" install_systemd_units 
install_systemd_generators )
        use device-mapper-only && INSTALL_TARGETS=( install_device-mapper )
        emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}"
 

Reply via email to