commit: 80f508cf33b67c0443d35679e0953e7007dda66f Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Wed Jan 20 07:41:57 2021 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Wed Jan 20 07:42:40 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80f508cf
net-misc/nx: fix install for Prefix, by Firas, bug #682864 Closes: https://bugs.gentoo.org/682864 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> net-misc/nx/nx-3.5.99.25.ebuild | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/net-misc/nx/nx-3.5.99.25.ebuild b/net-misc/nx/nx-3.5.99.25.ebuild index 2da4b0963c2..d3b7370a907 100644 --- a/net-misc/nx/nx-3.5.99.25.ebuild +++ b/net-misc/nx/nx-3.5.99.25.ebuild @@ -113,8 +113,9 @@ src_compile() { emake -C nx-X11 BuildDependsOnly # Parallel make issue resurfaced, upstream working on autotools switch emake -j1 -C nx-X11 World \ - USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \ - SHLIBDIR="/usr/$(get_libdir)" + USRLIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/X11" \ + SHLIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + ETCDIR_NX="${EPREFIX}/etc/nxagent" emake -C nxproxy } @@ -122,10 +123,11 @@ src_compile() { src_install() { emake \ DESTDIR="${D}" \ - PREFIX="/usr" \ - NXLIBDIR="/usr/$(get_libdir)/${PN}" \ - SHLIBDIR="/usr/$(get_libdir)" \ - USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \ + PREFIX="${EPREFIX}/usr" \ + NXLIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}" \ + SHLIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + USRLIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/X11" \ + ETCDIR_NX="${EPREFIX}/etc/nxagent" \ install # Already provided by mesa & related packages
