diff --git a/Makefile b/Makefile
index 605529a852..7f49c88d0b 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,8 @@
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+S :=
+
 SPDK_ROOT_DIR := $(CURDIR)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
diff --git a/mk/spdk.subdirs.mk b/mk/spdk.subdirs.mk
index e8064476d9..653a9cf0f6 100644
--- a/mk/spdk.subdirs.mk
+++ b/mk/spdk.subdirs.mk
@@ -1,3 +1,3 @@
 $(DIRS-y) :
-	@echo "== $S/$@ ($(MAKECMDGOALS))"
-	$(Q)$(MAKE) -e -C $@ S=$S/$@ $(MAKECMDGOALS) $(MAKESUBDIRFLAGS)
+	@echo "== $S$(S:%=/)$@ ($(MAKECMDGOALS))"
+	$(Q)$(MAKE) -e -C $@ S=$S$(S:%=/)$@ $(MAKECMDGOALS) $(MAKESUBDIRFLAGS)