update post-Lua

add lib/ to .gitignore

add optional "make fetch-Lua" step to simplify prerequisite to "make all"

diff --git a/.gitignore b/.gitignore
index 08346d41c9f721441358e4be49ddb4a267b1625f..9dc6b49f5fb29d18c8071936af8656270c2ff7e0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,7 @@ Release/
 binary/
 build/
 ipch/
+lib/
 Nethack.sln
 Nethack.sdf
 Nethack.opensdf

diff --git a/sys/unix/Makefile.top b/sys/unix/Makefile.top
index 13ceb19bf29bbdd4b731a332449c58167e0aee28..9d3cceeb8614a2c0c29e226c5ba7a476ce198d14 100644 (file)
--- a/sys/unix/Makefile.top
+++ b/sys/unix/Makefile.top
@@ -74,6 +74,9 @@ VARDAT = $(VARDATD) $(VARDATND)
 #CHOWN = chown
 #CHGRP = chgrp
 
+# Lua version
+LUA_VERSION = 5.3.5
+
 #
 # end of configuration
 #
@@ -232,7 +235,15 @@ dofiles-nodlb:
        -( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) $(DAT) ; \
                        $(CHGRP) $(GAMEGRP) $(DAT) ; \
                        chmod $(FILEPERM) $(DAT) )
-
+#
+# This is not part of the dependency build hierarchy.
+# It requires an explicit "make fetch-Lua".
+fetch-lua: fetch-Lua
+
+fetch-Lua:
+       ( mkdir -p lib ; cd lib ; \
+               curl -R -O http://www.lua.org/ftp/lua-$(LUA_VERSION).tar.gz ; \
+               tar zxf lua-$(LUA_VERSION).tar.gz ; rm -f lua-$(LUA_VERSION).tar.gz )
 update: $(GAME) recover $(VARDAT) spec_levs
 #      (don't yank the old version out from under people who're playing it)
        -mv $(INSTDIR)/$(GAME) $(INSTDIR)/$(GAME).old