diff --git a/data/Vortex86MX-eng/Makefile.cmm b/data/Vortex86MX-eng/Makefile.cmm
index 4b847b2ee9..561f7e49aa 100644
--- a/data/Vortex86MX-eng/Makefile.cmm
+++ b/data/Vortex86MX-eng/Makefile.cmm
@@ -7,7 +7,7 @@ define cmm_meta_rule
 $(1): $(2) Makefile.cmm $$(call respace,$$(addsuffix .dir,$(3))) \
  $$(wildcard $$(dir $(2))*) $$(wildcard $$(dir $(2))*/*)
 	flock $$(dir $(2)).lock -c '\
-	win32-c-- /D=AUTOBUILD /D=LANG_ENG $(5) /IP=Z:$$(dir $(2)) Z:$$< >&2 && \
+	(cd "$$(dir $(2))" && win32-c-- /D=AUTOBUILD /D=LANG_ENG $(5) $$(notdir $(2)) >&2) && \
 	if [ -e $$(basename $$<) ]; then f=$$(basename $$<); else f=$$(basename $$<).com; fi && \
 	kpack --nologo $$$$f "$$@" && rm $$$$f'
 endef
diff --git a/data/eng/Makefile.cmm b/data/eng/Makefile.cmm
index 4b847b2ee9..561f7e49aa 100644
--- a/data/eng/Makefile.cmm
+++ b/data/eng/Makefile.cmm
@@ -7,7 +7,7 @@ define cmm_meta_rule
 $(1): $(2) Makefile.cmm $$(call respace,$$(addsuffix .dir,$(3))) \
  $$(wildcard $$(dir $(2))*) $$(wildcard $$(dir $(2))*/*)
 	flock $$(dir $(2)).lock -c '\
-	win32-c-- /D=AUTOBUILD /D=LANG_ENG $(5) /IP=Z:$$(dir $(2)) Z:$$< >&2 && \
+	(cd "$$(dir $(2))" && win32-c-- /D=AUTOBUILD /D=LANG_ENG $(5) $$(notdir $(2)) >&2) && \
 	if [ -e $$(basename $$<) ]; then f=$$(basename $$<); else f=$$(basename $$<).com; fi && \
 	kpack --nologo $$$$f "$$@" && rm $$$$f'
 endef
diff --git a/data/new-stack/Makefile.cmm b/data/new-stack/Makefile.cmm
index 4b847b2ee9..561f7e49aa 100644
--- a/data/new-stack/Makefile.cmm
+++ b/data/new-stack/Makefile.cmm
@@ -7,7 +7,7 @@ define cmm_meta_rule
 $(1): $(2) Makefile.cmm $$(call respace,$$(addsuffix .dir,$(3))) \
  $$(wildcard $$(dir $(2))*) $$(wildcard $$(dir $(2))*/*)
 	flock $$(dir $(2)).lock -c '\
-	win32-c-- /D=AUTOBUILD /D=LANG_ENG $(5) /IP=Z:$$(dir $(2)) Z:$$< >&2 && \
+	(cd "$$(dir $(2))" && win32-c-- /D=AUTOBUILD /D=LANG_ENG $(5) $$(notdir $(2)) >&2) && \
 	if [ -e $$(basename $$<) ]; then f=$$(basename $$<); else f=$$(basename $$<).com; fi && \
 	kpack --nologo $$$$f "$$@" && rm $$$$f'
 endef
diff --git a/data/rus/Makefile.cmm b/data/rus/Makefile.cmm
index a191699eac..079cbf95c1 100644
--- a/data/rus/Makefile.cmm
+++ b/data/rus/Makefile.cmm
@@ -7,7 +7,7 @@ define cmm_meta_rule
 $(1): $(2) Makefile.cmm $$(call respace,$$(addsuffix .dir,$(3))) \
  $$(wildcard $$(dir $(2))*) $$(wildcard $$(dir $(2))*/*)
 	flock $$(dir $(2)).lock -c '\
-	win32-c-- /D=AUTOBUILD /D=LANG_RUS $(5) /IP=Z:$$(dir $(2)) Z:$$< >&2 && \
+	(cd "$$(dir $(2))" && win32-c-- /D=AUTOBUILD /D=LANG_RUS $(5) $$(notdir $(2)) >&2) && \
 	if [ -e $$(basename $$<) ]; then f=$$(basename $$<); else f=$$(basename $$<).com; fi && \
 	kpack --nologo $$$$f "$$@" && rm $$$$f'
 endef