build: fix wabt installation process

Author: kgryte

tools/make/common.mk

@@ -512,13 +512,13 @@ DEPS_EMSDK_BINARYEN_VERSION ?= main
 DEPS_WABT_BUILD_OUT ?= $(DEPS_BUILD_DIR)/wabt
 
 # Define the path to the utility for converting WebAssembly binary files to the WebAssembly text format:
-DEPS_WABT_WASM2WAT ?= $(DEPS_WABT_BUILD_OUT)/wasm2wat
+DEPS_WABT_WASM2WAT ?= $(DEPS_WABT_BUILD_OUT)/build/wasm2wat
 
 # Define the path to the utility for converting WebAssembly text format files to the WebAssembly binary format:
-DEPS_WABT_WAT2WASM ?= $(DEPS_WABT_BUILD_OUT)/wat2wasm
+DEPS_WABT_WAT2WASM ?= $(DEPS_WABT_BUILD_OUT)/build/wat2wasm
 
 # Define the path to the utility for linking (merging) multiple WebAssembly files:
-DEPS_WABT_WASM_LINK ?= $(DEPS_WABT_BUILD_OUT)/wasm-link
+DEPS_WABT_WASM_LINK ?= $(DEPS_WABT_BUILD_OUT)/build/wasm-link
 
 # Define the Cephes distribution to build (netlib, moshier, cephes-2.8):
 DEPS_CEPHES_DIST ?= moshier

tools/make/lib/install/wabt.mk

@@ -161,7 +161,11 @@ deps-prerequisites-wabt:
 # make deps-install-wabt
 #/
 deps-install-wabt: $(DEPS_WABT_BUILD_OUT) deps-prerequisites-wabt
-	$(QUIET) cd $(DEPS_WABT_BUILD_OUT) && $(CMAKE) . && $(MAKE)
+	$(QUIET) cd $(DEPS_WABT_BUILD_OUT) && \
+		$(MKDIR_RECURSIVE) build && \
+		cd build && \
+		$(CMAKE) .. && \
+		$(CMAKE) --build .
 
 .PHONY: deps-install-wabt
 
@@ -177,9 +181,11 @@ deps-update-wabt: $(DEPS_WABT_BUILD_OUT)
 	$(QUIET) cd $(DEPS_WABT_BUILD_OUT) && \
 		$(GIT) pull && \
 		$(GIT) submodule update --init --recursive && \
-		$(DELETE) $(DELETE_FLAGS) $(DEPS_WABT_BUILD_OUT)/out &&
-		$(CMAKE) . && \
-		$(MAKE)
+		$(DELETE) $(DELETE_FLAGS) $(DEPS_WABT_BUILD_OUT)/build &&
+		$(MKDIR_RECURSIVE) $(DEPS_WABT_BUILD_OUT)/build && \
+		cd $(DEPS_WABT_BUILD_OUT)/build && \
+		$(CMAKE) .. && \
+		$(CMAKE) --build .
 
 .PHONY: deps-update-wabt