From: Bart House <bart@barthouse.com>
Date: Mon, 14 Dec 2020 17:56:59 +0000 (-0800)
Subject: Modify expectations of where LUA sources are located.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=190f9dc4886e01aa8d9343afa93f93e861e4f969;p=nethack

Modify expectations of where LUA sources are located.

We want the build to assume the same basic layout as the lua repository.
The sources are immediately at the top of the repository and not in
a subdirectory called 'src'.
---

diff --git a/sys/winnt/Makefile.gcc b/sys/winnt/Makefile.gcc
index 398e17053..e44851950 100644
--- a/sys/winnt/Makefile.gcc
+++ b/sys/winnt/Makefile.gcc
@@ -134,7 +134,10 @@ endif
 #---------------------------------------------------------------
 # Location of LUA
 #
-# Original source needs to be obtained from:
+# Using appropriate tag, source can be obtained from the git repository:
+#    https://github.com/NetHack/NetHack.git
+#
+# Source for 5.4.2 could also be obtained from:
 #    http://www.lua.org/ftp/lua-5.4.2.tar.gz
 #
 #    This build assumes that the LUA sources are located
@@ -154,8 +157,11 @@ endif
 #
 # The source for the standalone interpreter (luac.c) is not kept with the
 # rest of the LUA source.
+#
 # The source is kept at:
-#     https://github.com/lua/luac
+#     https://github.com/lua/luac.git
+#
+# If building, copy luac.c into the directory LUATOP.
 #
 # By default we will not build it.
 #
@@ -441,7 +447,7 @@ OPTIONS_FILE = $(DAT)\options
 ifndef LUAVER
 LUAVER   = 5.4.2
 endif
-LUASRC   = $(LUATOP)/src
+LUASRC   = $(LUATOP)
 LUALIB   = $(O)lua-$(LUAVER).static.a
 LUADLL   = $(O)lua-$(LUAVER).a
 LUAINCL  = -I$(LUASRC)