unix: install recover command by default

- Update Makefile.top to do the deed
- Update Install.unx and README.linux to reflect the changed install procedure
This commit is contained in:
cohrs
2002-04-07 19:05:07 +00:00
parent 7c386ab823
commit 05fb883473
4 changed files with 15 additions and 9 deletions
+1
View File
@@ -76,6 +76,7 @@ X11: restore support for non-square tiles when USE_XPM is defined
Gnome: add support for non-square tiles Gnome: add support for non-square tiles
tty: remove #define DEBUG that forced debug behavior in production builds tty: remove #define DEBUG that forced debug behavior in production builds
X11: getlin dialog got steadily narrower each time it was used X11: getlin dialog got steadily narrower each time it was used
unix: install recover command into GAMEDIR by default
General New Features General New Features
+4 -4
View File
@@ -77,10 +77,10 @@
files the main executable will use. Then become root if necessary and files the main executable will use. Then become root if necessary and
type 'make install'. Everything should now be set. type 'make install'. Everything should now be set.
8. Read doc/recover.man or doc/recover.txt, and think about whether and 8. Read doc/recover.man or doc/recover.txt to learn how to use the recover
how you want to install the recover program. If you decide to install program. The recover program can be used in case of a crash to recover
it, type 'make recover' in the util directory and then install recover a game that was in progress. The recover command is installed in the
by hand in your desired manner. GAMEDIR by default.
Notes: Notes:
+9 -3
View File
@@ -87,7 +87,7 @@ DAT = $(DATNODLB) $(DATDLB)
$(GAME): $(GAME):
( cd src ; $(MAKE) ) ( cd src ; $(MAKE) )
all: $(GAME) Guidebook $(VARDAT) dungeon spec_levs check-dlb all: $(GAME) recover Guidebook $(VARDAT) dungeon spec_levs check-dlb
@echo "Done." @echo "Done."
# Note: many of the dependencies below are here to allow parallel make # Note: many of the dependencies below are here to allow parallel make
@@ -164,6 +164,10 @@ dlb:
( cd util ; $(MAKE) dlb ) ( cd util ; $(MAKE) dlb )
( cd dat ; ../util/dlb cf nhdat $(DATDLB) ) ( cd dat ; ../util/dlb cf nhdat $(DATDLB) )
# recover can be used when INSURANCE is defined in include/config.h
# and the checkpoint option is true
recover: $(GAME)
( cd util ; $(MAKE) recover )
dofiles: dofiles:
target=`sed -n \ target=`sed -n \
@@ -174,6 +178,7 @@ dofiles:
-e '$$s/.*/nodlb/p' < dat/options` ; \ -e '$$s/.*/nodlb/p' < dat/options` ; \
$(MAKE) dofiles-$${target-nodlb} $(MAKE) dofiles-$${target-nodlb}
cp src/$(GAME) $(GAMEDIR) cp src/$(GAME) $(GAMEDIR)
cp util/recover $(GAMEDIR)
-rm -f $(SHELLDIR)/$(GAME) -rm -f $(SHELLDIR)/$(GAME)
sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \ sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \
-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \ -e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
@@ -183,6 +188,7 @@ dofiles:
-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) ; \ -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) ; \
$(CHGRP) $(GAMEGRP) $(GAME) ) $(CHGRP) $(GAMEGRP) $(GAME) )
chmod $(GAMEPERM) $(GAMEDIR)/$(GAME) chmod $(GAMEPERM) $(GAMEDIR)/$(GAME)
chmod $(EXEPERM) $(GAMEDIR)/recover
-$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME) -$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)
$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME) $(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)
chmod $(EXEPERM) $(SHELLDIR)/$(GAME) chmod $(EXEPERM) $(SHELLDIR)/$(GAME)
@@ -202,7 +208,7 @@ dofiles-nodlb:
$(CHGRP) $(GAMEGRP) $(DAT) ; \ $(CHGRP) $(GAMEGRP) $(DAT) ; \
chmod $(FILEPERM) $(DAT) ) chmod $(FILEPERM) $(DAT) )
update: $(GAME) $(VARDAT) dungeon spec_levs update: $(GAME) recover $(VARDAT) dungeon spec_levs
# (don't yank the old version out from under people who're playing it) # (don't yank the old version out from under people who're playing it)
-mv $(GAMEDIR)/$(GAME) $(GAMEDIR)/$(GAME).old -mv $(GAMEDIR)/$(GAME) $(GAMEDIR)/$(GAME).old
# quest.dat is also kept open and has the same problems over NFS # quest.dat is also kept open and has the same problems over NFS
@@ -218,7 +224,7 @@ update: $(GAME) $(VARDAT) dungeon spec_levs
# and a reminder # and a reminder
@echo You may also want to install the man pages via the doc Makefile. @echo You may also want to install the man pages via the doc Makefile.
install: $(GAME) $(VARDAT) dungeon spec_levs install: $(GAME) recover $(VARDAT) dungeon spec_levs
# set up the directories # set up the directories
# not all mkdirs have -p; those that don't will create a -p directory # not all mkdirs have -p; those that don't will create a -p directory
-mkdir -p $(SHELLDIR) -mkdir -p $(SHELLDIR)
+1 -2
View File
@@ -82,8 +82,7 @@ System: egcs-1.1.2, XFree86-3.3.6, xpm-3.4k, ncurses-5.0, glibc-2.1.3
4. unixconf.h: define LINUX 4. unixconf.h: define LINUX
define TIMED_DELAY define TIMED_DELAY
5. make all; (cd util; make recover); su; make install; 5. make all; su; make install
cp util/recover /usr/games/lib/nethackdir/recover
6. Convert nh10.bdf and ibm.bdf to proper font files and place in 6. Convert nh10.bdf and ibm.bdf to proper font files and place in
font path. font path.