From: Adam Powers <apowers@ato.ms>
Date: Mon, 19 Oct 2020 18:49:34 +0000 (-0700)
Subject: update to new build system
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c91ec0068f192b80c5bc0fa1711a32074dc9919e;p=nethack

update to new build system
---

diff --git a/sys/libnh/test/run.sh b/sys/libnh/test/run.sh
index b89ab55d9..e930684c4 100755
--- a/sys/libnh/test/run.sh
+++ b/sys/libnh/test/run.sh
@@ -2,11 +2,13 @@
 
 if [ x$1 == "xlib" ]; then
     echo Doing lib...
-    make spotless
-    cd sys/lib
+    if [ -f Makefile ]; then
+        make spotless
+    fi
+    cd sys/unix
     ./setup.sh hints/macOS.2020
     cd ../..
-    make
+    make WANT_LIBNH=1
 fi
 
 if [ x$1 == "xrunlib" ]; then
@@ -19,15 +21,17 @@ fi
 
 if [ x$1 == "xwasm" ]; then
     echo Doing wasm...
-    make spotless
-    cd sys/lib
-    ./setup.sh hints/wasm
+    if [ -f Makefile ]; then
+        make spotless
+    fi
+    cd sys/unix
+    ./setup.sh hints/macOS.2020
     cd ../..
-    make
+    make CROSS_TO_WASM=1
 fi
 
 if [ x$1 == "xrunwasm" ]; then
-    cd sys/lib/npm-package && node test/test.js
+    cd sys/lib/npm-package && npm run build && node test/test.js
 fi
 
 if [ x$1 == "xbin" ]; then