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.
This commit is contained in:
@@ -195,7 +195,7 @@ ODATE = $(OBJDIR)/date.o
|
|||||||
MAKEOBJS = makedefs.o $(OMONOBJ) $(ODATE) $(OALLOC)
|
MAKEOBJS = makedefs.o $(OMONOBJ) $(ODATE) $(OALLOC)
|
||||||
|
|
||||||
# object files for recovery utility
|
# object files for recovery utility
|
||||||
RECOVOBJS = recover.o
|
RECOVOBJS = $(TARGETPFX)recover.o
|
||||||
|
|
||||||
# object files for the data librarian
|
# object files for the data librarian
|
||||||
DLBOBJS = dlb_main.o $(OBJDIR)/dlb.o $(OALLOC)
|
DLBOBJS = dlb_main.o $(OBJDIR)/dlb.o $(OALLOC)
|
||||||
@@ -266,11 +266,11 @@ lintdgn:
|
|||||||
|
|
||||||
# dependencies for recover
|
# dependencies for recover
|
||||||
#
|
#
|
||||||
recover: $(RECOVOBJS)
|
$(TARGETPFX)recover: $(RECOVOBJS)
|
||||||
$(CLINK) $(LFLAGS) -o recover $(RECOVOBJS) $(LIBS)
|
$(TARGET_CLINK) $(TARGET_LFLAGS) -o recover $(RECOVOBJS) $(LIBS)
|
||||||
|
|
||||||
recover.o: recover.c $(CONFIG_H)
|
$(TARGETPFX)recover.o: recover.c $(CONFIG_H)
|
||||||
$(CC) $(CFLAGS) -c recover.c -o $@
|
$(TARGET_CC) $(TARGET_CFLAGS) $(CSTD) -c recover.c -o $@
|
||||||
|
|
||||||
|
|
||||||
# dependencies for dlb
|
# dependencies for dlb
|
||||||
|
|||||||
@@ -258,7 +258,7 @@ endif # WANT_LIBNH
|
|||||||
|
|
||||||
#PREFIX=/usr
|
#PREFIX=/usr
|
||||||
PREFIX=$(wildcard ~)/nh/install
|
PREFIX=$(wildcard ~)/nh/install
|
||||||
HACKDIR=$(PREFIX)/games/lib/$(GAME)dir
|
HACKDIR=$(PREFIX)/games/lib/nethackdir
|
||||||
SHELLDIR = $(PREFIX)/games
|
SHELLDIR = $(PREFIX)/games
|
||||||
INSTDIR=$(HACKDIR)
|
INSTDIR=$(HACKDIR)
|
||||||
VARDIR = $(HACKDIR)
|
VARDIR = $(HACKDIR)
|
||||||
|
|||||||
+1
-1
@@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
|
|
||||||
PREFIX=/usr
|
PREFIX=/usr
|
||||||
HACKDIR=$(PREFIX)/games/lib/$(GAME)dir
|
HACKDIR=$(PREFIX)/games/lib/nethackdir
|
||||||
INSTDIR=$(HACKDIR)
|
INSTDIR=$(HACKDIR)
|
||||||
VARDIR=$(HACKDIR)
|
VARDIR=$(HACKDIR)
|
||||||
SHELLDIR=$(PREFIX)/games
|
SHELLDIR=$(PREFIX)/games
|
||||||
|
|||||||
Reference in New Issue
Block a user