From: nhmall <nhmall@nethack.org>
Date: Thu, 19 May 2022 11:44:29 +0000 (-0400)
Subject: differentiate lua object library names by Lua ver
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f57555ae6b301ff66ab38309b4e1a4398d1121cc;p=nethack

differentiate lua object library names by Lua ver
---

diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src
index 90000e2b4..f5aedbae4 100644
--- a/sys/unix/Makefile.src
+++ b/sys/unix/Makefile.src
@@ -465,7 +465,7 @@ PACKAGE=@true
 MAKEDEFS = ../util/makedefs
 
 # -lm required by lua
-LUALIB = ../lib/lua/liblua.a -lm $(DLLIB)
+LUALIB = ../lib/lua/liblua-$(LUA_VERSION).a -lm $(DLLIB)
 
 # timestamp files to reduce `make' overhead and shorten .o dependency lists
 CONFIG_H = ../src/config.h-t
@@ -660,7 +660,7 @@ DUMB.Setup:	../include/extern.h
 	cp ../include/extern.DUMB ../include/extern.h
 	@touch DUMB.Setup
 
-../lib/lua/liblua.a ../include/nhlua.h:
+../lib/lua/liblua-$(LUA_VERSION).a ../include/nhlua.h:
 	@( cd .. ; $(MAKE) lua_support )
 
 #	dependencies for makedefs and its outputs, which the util
diff --git a/sys/unix/Makefile.top b/sys/unix/Makefile.top
index 3d3b94cf8..7fbef30f9 100644
--- a/sys/unix/Makefile.top
+++ b/sys/unix/Makefile.top
@@ -109,7 +109,7 @@ LUATESTTARGET = $(LUAHEADERS)/lua.h
 LUATOP = $(LUAHEADERS)
 LUAMAKEFLAGS = CC='$(CC)' SYSCFLAGS='$(SYSCFLAGS)'
 LUA2NHTOP = ../../..
-TOPLUALIB = lib/lua/liblua.a
+TOPLUALIB = lib/lua/liblua-$(LUA_VERSION).a
 
 ALLDEP = $(GAME) recover Guidebook $(VARDAT) spec_levs check-dlb
 
@@ -119,14 +119,14 @@ all:    $(ALLDEP)
 	@echo "Done."
 
 $(GAME): lua_support
-	( cd src ; $(MAKE) $(GAME) )
+	( cd src ; $(MAKE) LUA_VERSION=$(LUA_VERSION) $(GAME) )
 
 lua_support: include/nhlua.h
 	@true
 $(LUATOP)/liblua.a: $(LUAHEADERS)/lua.h
 	( cd $(LUATOP) \
 	  && make $(LUAMAKEFLAGS) a && cd $(LUA2NHTOP) )
-lib/lua/liblua.a: $(LUATOP)/liblua.a
+$(TOPLUALIB): $(LUATOP)/liblua.a
 	@( if test -d lib/lua ; then true ; else mkdir -p lib/lua ; fi )
 	cp $(LUATOP)/liblua.a $@