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

diff --git a/doc/fixes34.1 b/doc/fixes34.1
index e2b06391c2f5c6fe87f673231fc2d0e4e22cc571..fbadb590793846298f16d28933c27057ab82baec 100644 (file)
--- a/doc/fixes34.1
+++ b/doc/fixes34.1
@@ -76,6 +76,7 @@ X11: restore support for non-square tiles when USE_XPM is defined
 Gnome: add support for non-square tiles
 tty: remove #define DEBUG that forced debug behavior in production builds
 X11: getlin dialog got steadily narrower each time it was used
+unix: install recover command into GAMEDIR by default
 
 
 General New Features

diff --git a/sys/unix/Install.unx b/sys/unix/Install.unx
index 06680842a584ee603c318bc5beacfb14c52cb3fe..505ec80ee74a0c105a340ff3155cc6f37a8559ed 100644 (file)
--- a/sys/unix/Install.unx
+++ b/sys/unix/Install.unx
@@ -77,10 +77,10 @@
     files the main executable will use.  Then become root if necessary and
     type 'make install'.  Everything should now be set.
 
-8.  Read doc/recover.man or doc/recover.txt, and think about whether and
-    how you want to install the recover program.  If you decide to install
-    it, type 'make recover' in the util directory and then install recover
-    by hand in your desired manner.
+8.  Read doc/recover.man or doc/recover.txt to learn how to use the recover
+    program.  The recover program can be used in case of a crash to recover
+    a game that was in progress.  The recover command is installed in the
+    GAMEDIR by default.
 
 Notes:
 

diff --git a/sys/unix/Makefile.top b/sys/unix/Makefile.top
index fafd71a8e6cbe58f63e401b1d45c607d4b93bef0..cda9c4dc16d6e30f2d155492fdbcdacbf8ddc9aa 100644 (file)
--- a/sys/unix/Makefile.top
+++ b/sys/unix/Makefile.top
@@ -87,7 +87,7 @@ DAT = $(DATNODLB) $(DATDLB)
 $(GAME):
        ( cd src ; $(MAKE) )
 
-all:   $(GAME) Guidebook $(VARDAT) dungeon spec_levs check-dlb
+all:   $(GAME) recover Guidebook $(VARDAT) dungeon spec_levs check-dlb
        @echo "Done."
 
 # Note: many of the dependencies below are here to allow parallel make
@@ -164,6 +164,10 @@ dlb:
        ( cd util ; $(MAKE) dlb )
        ( 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:
        target=`sed -n                                  \
@@ -174,6 +178,7 @@ dofiles:
                -e '$$s/.*/nodlb/p' < dat/options` ;    \
        $(MAKE) dofiles-$${target-nodlb}
        cp src/$(GAME) $(GAMEDIR)
+       cp util/recover $(GAMEDIR)
        -rm -f $(SHELLDIR)/$(GAME)
        sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \
                -e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
@@ -183,6 +188,7 @@ dofiles:
        -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) ; \
                        $(CHGRP) $(GAMEGRP) $(GAME) )
        chmod $(GAMEPERM) $(GAMEDIR)/$(GAME)
+       chmod $(EXEPERM) $(GAMEDIR)/recover
        -$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)
        $(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)
        chmod $(EXEPERM) $(SHELLDIR)/$(GAME)
@@ -202,7 +208,7 @@ dofiles-nodlb:
                        $(CHGRP) $(GAMEGRP) $(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)
        -mv $(GAMEDIR)/$(GAME) $(GAMEDIR)/$(GAME).old
 #      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
        @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
 # not all mkdirs have -p; those that don't will create a -p directory
        -mkdir -p $(SHELLDIR)

diff --git a/sys/unix/README.linux b/sys/unix/README.linux
index 1c271347e90b76bde9d9cc9b1582f401d8674c79..e2261e378ff069170298c0a0c4caaaf95e59dbaf 100644 (file)
--- a/sys/unix/README.linux
+++ b/sys/unix/README.linux
@@ -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
                 define TIMED_DELAY
 
-5.  make all; (cd util; make recover); su; make install;
-    cp util/recover /usr/games/lib/nethackdir/recover
+5.  make all; su; make install
 
 6.  Convert nh10.bdf and ibm.bdf to proper font files and place in
     font path.