From e6f5899200c007e8c4babed2add95c3727eae090 Mon Sep 17 00:00:00 2001 From: nhmall Date: Sun, 24 Nov 2019 12:39:00 -0500 Subject: [PATCH 1/2] added protection in Makefile for cross-compile (although should not happen): --- src/version.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/version.c b/src/version.c index 0ab1d8249..099cecb6d 100644 --- a/src/version.c +++ b/src/version.c @@ -44,7 +44,9 @@ const char *NetHack_git_sha #if !defined(CROSSCOMPILE) || (defined(CROSSCOMPILE) && defined(CROSSCOMPILE_HOST)) = NETHACK_GIT_SHA #else - = NETHACK_HOST_GIT_SHA +#ifdef NETHACK_HOST_GIT_SHA + = NETHACK_HOST_GIT_SHA +#endif #endif ; #endif @@ -54,8 +56,10 @@ const char *NetHack_git_branch #if !defined(CROSSCOMPILE) || (defined(CROSSCOMPILE) && defined(CROSSCOMPILE_HOST)) = NETHACK_GIT_BRANCH #else +#ifdef NETHACK_HOST_GIT_BRANCH = NETHACK_HOST_GIT_BRANCH #endif +#endif ; #endif From 350371e0304f33ea777a283c6581b831e8a34a2d Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Sun, 24 Nov 2019 19:39:31 +0200 Subject: [PATCH 2/2] Don't remove dungeon.lua with make spotless --- sys/unix/Makefile.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/unix/Makefile.dat b/sys/unix/Makefile.dat index bbc093ac4..48d50b77c 100644 --- a/sys/unix/Makefile.dat +++ b/sys/unix/Makefile.dat @@ -9,7 +9,7 @@ NHSROOT=.. # SHELL=E:/GEMINI2/MUPFEL.TTP # UUDECODE=uudecode -VARDAT = bogusmon data engrave epitaph rumors quest.lua oracles options +VARDAT = bogusmon data engrave epitaph rumors oracles options all: $(VARDAT) spec_levs quest_levs