[gentoo-commits] repo/gentoo:master commit in: games-roguelike/nethack/

[James Le Cuirot]

commit:     387f119ffcca27e5de60e7f60f1b404312199986
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  9 22:45:37 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Oct  9 22:45:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=387f119f

games-roguelike/nethack: Don't use ${ED} in src_compile

It's not allowed, and it's not needed here.

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-roguelike/nethack/nethack-3.6.7.ebuild | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/games-roguelike/nethack/nethack-3.6.7.ebuild 
b/games-roguelike/nethack/nethack-3.6.7.ebuild
index 21b5d8961d16..08b526369699 100644
--- a/games-roguelike/nethack/nethack-3.6.7.ebuild
+++ b/games-roguelike/nethack/nethack-3.6.7.ebuild
@@ -71,9 +71,8 @@ src_compile() {
        LOCAL_MAKEOPTS=(
                CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
                WINTTYLIB="$($(tc-getPKG_CONFIG) --libs ncurses)"
-               HACKDIR="${EPREFIX}/usr/$(get_libdir)/nethack" 
INSTDIR="${ED}/usr/$(get_libdir)/nethack"
-               SHELLDIR="${ED}/usr/bin" VARDIR="${ED}/var/games/nethack"
-               )
+               HACKDIR="${EPREFIX}/usr/$(get_libdir)/nethack"
+       )
 
        emake "${LOCAL_MAKEOPTS[@]}" nethack recover Guidebook spec_levs
 
@@ -82,7 +81,12 @@ src_compile() {
 }
 
 src_install() {
-       emake "${LOCAL_MAKEOPTS[@]}" install
+       emake \
+               "${LOCAL_MAKEOPTS[@]}" \
+               INSTDIR="${ED}/usr/$(get_libdir)/nethack" \
+               SHELLDIR="${ED}/usr/bin" \
+               VARDIR="${ED}/var/games/nethack" \
+               install
 
        mv "${ED}/usr/$(get_libdir)/nethack/recover" 
"${ED}/usr/bin/recover-nethack" || die "Failed to move recover-nethack"