fix recover on Linux

Also, recover should be a target-side utility, not host. That
really only makes a difference if you are cross-compiling.

diff --git a/sys/unix/Makefile.utl b/sys/unix/Makefile.utl
index b97f59b558cc37e24d3dbacd5287186369cfc09f..6c85f7e8de55583e129f3c28fe510ff7972a9ba2 100644 (file)
--- a/sys/unix/Makefile.utl
+++ b/sys/unix/Makefile.utl
@@ -195,7 +195,7 @@ ODATE = $(OBJDIR)/date.o
 MAKEOBJS = makedefs.o $(OMONOBJ) $(ODATE) $(OALLOC)
 
 # object files for recovery utility
-RECOVOBJS = recover.o
+RECOVOBJS = $(TARGETPFX)recover.o
 
 # object files for the data librarian
 DLBOBJS = dlb_main.o $(OBJDIR)/dlb.o $(OALLOC)
@@ -266,11 +266,11 @@ lintdgn:
 
 #      dependencies for recover
 #
-recover: $(RECOVOBJS)
-       $(CLINK) $(LFLAGS) -o recover $(RECOVOBJS) $(LIBS)
+$(TARGETPFX)recover: $(RECOVOBJS)
+       $(TARGET_CLINK) $(TARGET_LFLAGS) -o recover $(RECOVOBJS) $(LIBS)
 
-recover.o: recover.c $(CONFIG_H)
-       $(CC) $(CFLAGS) -c recover.c -o $@
+$(TARGETPFX)recover.o: recover.c $(CONFIG_H)
+       $(TARGET_CC) $(TARGET_CFLAGS) $(CSTD) -c recover.c -o $@
 
 
 #      dependencies for dlb

diff --git a/sys/unix/hints/linux.370 b/sys/unix/hints/linux.370
index ada161efc36ba7c477826cec09afb6a77a3a0bf0..39363b7ed2a9c9b114fd21dd46013b34506719c6 100755 (executable)
--- a/sys/unix/hints/linux.370
+++ b/sys/unix/hints/linux.370
@@ -258,7 +258,7 @@ endif  # WANT_LIBNH
 
 #PREFIX=/usr
 PREFIX=$(wildcard ~)/nh/install
-HACKDIR=$(PREFIX)/games/lib/$(GAME)dir
+HACKDIR=$(PREFIX)/games/lib/nethackdir
 SHELLDIR = $(PREFIX)/games
 INSTDIR=$(HACKDIR)
 VARDIR = $(HACKDIR)

diff --git a/sys/unix/hints/unix b/sys/unix/hints/unix
index b761757ea800311b3826fbaac556c06cf2336fdd..7b937c45f9dbb3de021713449788197f1e98d7d4 100644 (file)
--- a/sys/unix/hints/unix
+++ b/sys/unix/hints/unix
@@ -11,7 +11,7 @@
 
 
 PREFIX=/usr
-HACKDIR=$(PREFIX)/games/lib/$(GAME)dir
+HACKDIR=$(PREFIX)/games/lib/nethackdir
 INSTDIR=$(HACKDIR)
 VARDIR=$(HACKDIR)
 SHELLDIR=$(PREFIX)/games