From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7E95D1382C5 for ; Wed, 20 Jan 2021 07:42:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0BA6E081A; Wed, 20 Jan 2021 07:42:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 93B27E081A for ; Wed, 20 Jan 2021 07:42:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B9196340D80 for ; Wed, 20 Jan 2021 07:42:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 770EBB9 for ; Wed, 20 Jan 2021 07:42:43 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1611128560.80f508cf33b67c0443d35679e0953e7007dda66f.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/nx/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/nx/nx-3.5.99.25.ebuild X-VCS-Directories: net-misc/nx/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 80f508cf33b67c0443d35679e0953e7007dda66f X-VCS-Branch: master Date: Wed, 20 Jan 2021 07:42:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 23563cc6-7614-4afd-b2b5-b21835606712 X-Archives-Hash: 3b45a059da740ddf88c044cd83dbd360 commit: 80f508cf33b67c0443d35679e0953e7007dda66f Author: Fabian Groffen gentoo org> AuthorDate: Wed Jan 20 07:41:57 2021 +0000 Commit: Fabian Groffen gentoo 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 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