From: Dexter Castor Döpping <dexter.c.dopping@gmail.com>
Date: Wed, 15 Dec 2021 21:46:40 +0000 (+0100)
Subject: Place libnh targets in $(TARGETPFX)
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07715c3bad103b592b61539f5b67eab06d6ca76d;p=nethack

Place libnh targets in $(TARGETPFX)
---

diff --git a/sys/unix/hints/linux.2020 b/sys/unix/hints/linux.2020
index 523853653..c0ef788be 100755
--- a/sys/unix/hints/linux.2020
+++ b/sys/unix/hints/linux.2020
@@ -155,13 +155,13 @@ LIBNHSYSSRC = ../sys/libnh/libnhmain.c \
 		../sys/share/ioctl.c ../sys/share/unixtty.c \
 		../sys/unix/unixunix.c ../sys/unix/unixres.c \
 		../win/shim/winshim.c
-LIBNHSYSOBJ = libnhmain.o $(TARGETPFX)ioctl.o \
+LIBNHSYSOBJ = $(TARGETPFX)libnhmain.o $(TARGETPFX)ioctl.o \
 		$(TARGETPFX)unixtty.o $(TARGETPFX)unixunix.o \
-		$(TARGETPFX)unixres.o winshim.o
+		$(TARGETPFX)unixres.o $(TARGETPFX)winshim.o
 #don't bother building the game executable as it will fail
 #without winshim
 override GAME=
-MOREALL += ( cd src ; $(MAKE) pregame ; $(MAKE) libnh.a )
+MOREALL += ( cd src ; $(MAKE) pregame ; $(MAKE) $(TARGETPFX)libnh.a )
 endif  # WANT_LIBNH
 
 #PREFIX=/usr
@@ -211,12 +211,12 @@ GAMEPERM = 0755
 #-INCLUDE cross-post.2020
 #
 ifdef WANT_LIBNH
-libnh.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
+$(TARGETPFX)libnh.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
 	$(AR) rcs $@ $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
 	@echo "$@ built."
-libnhmain.o : ../sys/libnh/libnhmain.c $(HACK_H)
+$(TARGETPFX)libnhmain.o : ../sys/libnh/libnhmain.c $(HACK_H)
 	$(CC) $(CFLAGS) -c -o$@ $<
-winshim.o : ../win/shim/winshim.c $(HACK_H)
+$(TARGETPFX)winshim.o : ../win/shim/winshim.c $(HACK_H)
 	$(CC) $(CFLAGS) -c -o$@ $<
 endif  # WANT_LIBNH
 #
diff --git a/sys/unix/hints/macOS.2020 b/sys/unix/hints/macOS.2020
index 0cee67202..c4ec7f732 100755
--- a/sys/unix/hints/macOS.2020
+++ b/sys/unix/hints/macOS.2020
@@ -155,13 +155,13 @@ LIBNHSYSSRC = ../sys/libnh/libnhmain.c \
 		../sys/share/ioctl.c ../sys/share/unixtty.c \
 		../sys/unix/unixunix.c ../sys/unix/unixres.c \
 		../win/shim/winshim.c
-LIBNHSYSOBJ = libnhmain.o $(TARGETPFX)ioctl.o \
+LIBNHSYSOBJ = $(TARGETPFX)libnhmain.o $(TARGETPFX)ioctl.o \
 		$(TARGETPFX)unixtty.o $(TARGETPFX)unixunix.o \
-		$(TARGETPFX)unixres.o winshim.o
+		$(TARGETPFX)unixres.o $(TARGETPFX)winshim.o
 #don't bother building the game executable as it will fail
 #without winshim
 override GAME=
-MOREALL += ( cd src ; $(MAKE) pregame ; $(MAKE) libnh.a )
+MOREALL += ( cd src ; $(MAKE) pregame ; $(MAKE) $(TARGETPFX)libnh.a )
 endif  # WANT_LIBNH
 
 WANT_BUNDLE=1
@@ -275,12 +275,12 @@ VARDIR=$(HACKDIR)
 #-POST
 
 ifdef WANT_LIBNH
-libnh.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
+$(TARGETPFX)libnh.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
 	$(AR) rcs $@ $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
 	@echo "$@ built."
-libnhmain.o : ../sys/libnh/libnhmain.c $(HACK_H)
+$(TARGETPFX)libnhmain.o : ../sys/libnh/libnhmain.c $(HACK_H)
 	$(CC) $(CFLAGS) -c -o$@ $<
-winshim.o : ../win/shim/winshim.c $(HACK_H)
+$(TARGETPFX)winshim.o : ../win/shim/winshim.c $(HACK_H)
 	$(CC) $(CFLAGS) -c -o$@ $<
 endif  # WANT_LIBNH