commit: c163d34421771338f2d3872ee3b308eb47015e21 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Jan 16 19:44:33 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jan 16 19:44:33 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c163d344
app-admin/gkrellm: preserve make args between phases; fix installation Preserve `emake` args down to install so we preserve that e.g. we haven't built translations w/ USE=-nls and don't try to install them later. Also, fix double DESTDIR. Closes: https://bugs.gentoo.org/968859 Signed-off-by: Sam James <sam <AT> gentoo.org> app-admin/gkrellm/gkrellm-2.5.0.ebuild | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app-admin/gkrellm/gkrellm-2.5.0.ebuild b/app-admin/gkrellm/gkrellm-2.5.0.ebuild index baa8b01e6d0b..5456f7b9dd04 100644 --- a/app-admin/gkrellm/gkrellm-2.5.0.ebuild +++ b/app-admin/gkrellm/gkrellm-2.5.0.ebuild @@ -87,7 +87,7 @@ src_compile() { tc-export PKG_CONFIG export TARGET=$(usex X . server) - local emakeargs=( + GKRELLM_MAKE_ARGS=( CC=$(tc-getCC) AR=$(tc-getAR) @@ -101,17 +101,17 @@ src_compile() { without-ssl=$(usex ssl $(usex gnutls) yes) without-gnutls=$(usex !gnutls) ) - emake "${emakeargs[@]}" -C ${TARGET} + emake "${GKRELLM_MAKE_ARGS[@]}" -C ${TARGET} } src_install() { - local emakeargs=( + GKRELLM_MAKE_ARGS+=( STRIP= DESTDIR="${D}" - PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" - CFGDIR="${ED}/etc" + PKGCONFIGDIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig" + CFGDIR="${EPREFIX}/etc" ) - emake "${emakeargs[@]}" install -C ${TARGET} + emake "${GKRELLM_MAKE_ARGS[@]}" install -C ${TARGET} newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
