Index: sys/unix/Makefile.top
--- sys/unix/Makefile.top.orig
+++ sys/unix/Makefile.top
@@ -121,13 +121,13 @@ DAT = $(DATNODLB) $(DATDLB)
 RECOVERBIN = recover
 
 # Lua
-LUAHEADERS = lib/lua-$(LUA_VERSION)/src
+LUAHEADERS = lib/lua-5.4
 LUATESTTARGET = $(LUAHEADERS)/lua.h
 LUATOP = $(LUAHEADERS)
 LUAMAKEFLAGS = CC='$(CC)' SYSCFLAGS='$(SYSCFLAGS)'
 LUA2NHTOP = ../../..
 LUABASELIB = liblua-$(LUA_VERSION).a
-TOPLUALIB = lib/lua/$(LUABASELIB)
+#TOPLUALIB = lib/lua/$(LUABASELIB)
 
 ALLDEP = $(PRECHECK) $(GAME) recover Guidebook $(VARDAT) spec_levs check-dlb
 
@@ -305,20 +305,20 @@ dofiles:
 	cp util/recover $(INSTDIR)
 	-if test -n '$(SHELLDIR)'; then rm -f $(SHELLDIR)/$(GAME); fi
 	if test -n '$(SHELLDIR)'; then \
-		sed -e 's;/usr/games/lib/nethackdir;$(HACKDIR);' \
+		sed -e 's;/usr/games/lib/nethackdir;$(REALHACKDIR);' \
 		-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
 		< sys/unix/nethack.sh \
-		> $(SHELLDIR)/$(GAME) ; fi
+		> $(SHELLDIR)/$(REALGAME) ; fi
 # set up their permissions
 	-( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) $(GAME) recover ; \
 			$(CHGRP) $(GAMEGRP) $(GAME) recover )
 	chmod $(GAMEPERM) $(INSTDIR)/$(GAME)
 	chmod $(EXEPERM) $(INSTDIR)/recover
 	-if test -n '$(SHELLDIR)'; then \
-		$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME); fi
+		$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(REALGAME); fi
 	if test -n '$(SHELLDIR)'; then \
-		$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME); \
-		chmod $(EXEPERM) $(SHELLDIR)/$(GAME); fi
+		$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(REALGAME); \
+		chmod $(EXEPERM) $(SHELLDIR)/$(REALGAME); fi
 
 dofiles-dlb: check-dlb
 	( cd dat ; cp nhdat $(DATNODLB) $(INSTDIR) )
