upgrade to 3.6.2

[jnethack/source.git] / sys / unix / Makefile.top

diff --git a/sys/unix/Makefile.top b/sys/unix/Makefile.top
index 72e9344..2266508 100644 (file)
--- a/sys/unix/Makefile.top
+++ b/sys/unix/Makefile.top
@@ -1,5 +1,7 @@
-#      NetHack Makefile.
-# NetHack 3.6  Makefile.top    $NHDT-Date: 1447844578 2015/11/18 11:02:58 $  $NHDT-Branch: master $:$NHDT-Revision: 1.32 $
+#      NetHack Top-level Makefile.
+# NetHack 3.6  Makefile.top    $NHDT-Date: 1524689449 2018/04/25 20:50:49 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.36 $
+# Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland
+# NetHack may be freely redistributed.  See license for details.
 
 # Root of source tree:
 NHSROOT=.
@@ -18,7 +20,8 @@ NHSROOT=.
 
 # make NetHack
 #PREFIX         = /usr
-GAME     = nethack
+# GAME     = nethack
+GAME     = jnethack
 # GAME     = nethack.prg
 #GAMEUID  = games
 #GAMEGRP  = bin
@@ -46,14 +49,14 @@ DIRPERM  = 0755
 
 # per discussion in Install.X11 and Install.Qt
 #VARDATND = 
-# VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xpm
-# VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xpm rip.xpm
+# VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm
+# VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm
 # for Atari/Gem
 # VARDATND = nh16.img title.img GEM_RSC.RSC rip.img
 # for BeOS
 # VARDATND = beostiles
 # for Gnome
-# VARDATND = x11tiles pet_mark.xbm pilemark.xpm rip.xpm mapbg.xpm
+# VARDATND = x11tiles pet_mark.xbm pilemark.xbm rip.xpm mapbg.xpm
 
 VARDATD = bogusmon data engrave epitaph oracles options quest.dat rumors
 VARDAT = $(VARDATD) $(VARDATND)
@@ -76,7 +79,7 @@ VARDAT = $(VARDATD) $(VARDATND)
 # end of configuration
 #
 
-DATHELP = help hh cmdhelp history opthelp wizhelp
+DATHELP = help hh cmdhelp keyhelp history opthelp wizhelp
 
 SPEC_LEVS = asmodeus.lev baalz.lev bigrm-*.lev castle.lev fakewiz?.lev \
        juiblex.lev knox.lev medusa-?.lev minend-?.lev minefill.lev \
@@ -85,7 +88,7 @@ SPEC_LEVS = asmodeus.lev baalz.lev bigrm-*.lev castle.lev fakewiz?.lev \
        astral.lev air.lev earth.lev fire.lev water.lev
 QUEST_LEVS = ???-goal.lev ???-fil?.lev ???-loca.lev ???-strt.lev
 
-DATNODLB = $(VARDATND) license
+DATNODLB = $(VARDATND) license symbols
 DATDLB = $(DATHELP) dungeon tribute $(SPEC_LEVS) $(QUEST_LEVS) $(VARDATD)
 DAT = $(DATNODLB) $(DATDLB)
 
@@ -150,8 +153,8 @@ beostiles: $(GAME)
        ( cd util ; $(MAKE) tile2beos )
        ( cd dat ; $(MAKE) beostiles )
 
-NetHack.ad: $(GAME)
-       ( cd dat ; $(MAKE) NetHack.ad )
+JNetHack.ad: $(GAME)
+       ( cd dat ; $(MAKE) JNetHack.ad )
 
 pet_mark.xbm:
        ( cd dat ; $(MAKE) pet_mark.xbm )
@@ -186,7 +189,7 @@ check-dlb: options
 
 dlb:
        ( cd util ; $(MAKE) dlb )
-       ( cd dat ; ../util/dlb cf nhdat $(DATDLB) )
+       ( cd dat ; LC_ALL=C ; ../util/dlb cf nhdat $(DATDLB) )
 
 # recover can be used when INSURANCE is defined in include/config.h
 # and the checkpoint option is true
@@ -201,7 +204,6 @@ dofiles:
                -e '}'                                  \
                -e '$$s/.*/nodlb/p' < dat/options` ;    \
        $(MAKE) dofiles-$${target-nodlb}
-       (cd dat ; cp symbols $(INSTDIR) )
        cp src/$(GAME) $(INSTDIR)
        cp util/recover $(INSTDIR)
        -if test -n '$(SHELLDIR)'; then rm -f $(SHELLDIR)/$(GAME); fi
@@ -220,9 +222,6 @@ dofiles:
        if test -n '$(SHELLDIR)'; then \
                $(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME); \
                chmod $(EXEPERM) $(SHELLDIR)/$(GAME); fi
-       -( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) symbols ; \
-                       $(CHGRP) $(GAMEGRP) symbols ; \
-                       chmod $(FILEPERM) symbols )
 
 dofiles-dlb: check-dlb
        ( cd dat ; cp nhdat $(DATNODLB) $(INSTDIR) )
@@ -293,7 +292,7 @@ clean:
 
 # 'make spotless' returns the source tree to near-distribution condition.
 # it removes .o files, executables, and compiled data files
-spotless:
+spotless::
        ( cd src ; $(MAKE) spotless )
        ( cd util ; $(MAKE) spotless )
        ( cd dat ; $(MAKE) spotless )