Merge "Workaround for legacy Bash array expansion"
diff --git a/Makefile b/Makefile
index 8c71dd1..9b6507a 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,14 @@
 ## Folders
 ##
 ROOT_DIR := $(CURDIR)
+
+# DIST_DIR might be defined by the CI build (pKVM Busytown)
+ifdef DIST_DIR
+OUT_DIR := $(DIST_DIR)
+else
 OUT_DIR := $(ROOT_DIR)/out
+endif
+
 LINUX_OUT := $(OUT_DIR)/linux
 CCACHE_DIR := $(OUT_DIR)/.ccache
 SCRIPTS_DIR := $(ROOT_DIR)/build