From: PatR <rankin@nethack.org>
Date: Sat, 12 Dec 2020 22:10:18 +0000 (-0800)
Subject: Makefile vs lua fix
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc7fb05dcfd019c00a5b5b5ee9a0e5c1e730e9bf;p=nethack

Makefile vs lua fix

I've been ignoring submodules so far.  For the old method of
dealing with lua, the instructions

You might need to do
  make spotless
  make fetch-lua

aren't adequate.  They should be

When lua version has changed in Makefile.top, before running
setup.sh to put that new Makefile in place, do
  make spotless
then
  sys/unix/setup.sh [hints/...]
  make fetch-lua

otherwise it will try to clean up the not yet fetched new lua
version instead of the old one.
---

diff --git a/sys/unix/Makefile.top b/sys/unix/Makefile.top
index a0824a155..53fc5dbaf 100644
--- a/sys/unix/Makefile.top
+++ b/sys/unix/Makefile.top
@@ -1,5 +1,5 @@
 #      NetHack Top-level Makefile.
-# NetHack 3.7  Makefile.top    $NHDT-Date: 1597031649 2020/08/10 03:54:09 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.52 $
+# NetHack 3.7  Makefile.top    $NHDT-Date: 1607810996 2020/12/12 22:09:56 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.63 $
 # Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland
 # NetHack may be freely redistributed.  See license for details.
 
@@ -320,7 +320,7 @@ clean:
 	( cd util ; $(MAKE) clean )
 	( cd dat ; $(MAKE) clean )
 	( cd doc ; $(MAKE) clean )
-	( cd lib/lua-$(LUA_VERSION)/src && $(MAKE) clean )
+	-( cd lib/lua-$(LUA_VERSION)/src && $(MAKE) clean )
 
 # 'make spotless' returns the source tree to near-distribution condition.
 # it removes .o files, executables, and compiled data files