diff --git a/Makefile b/Makefile
index 51233778b..4852575fb 100644
--- a/Makefile
+++ b/Makefile
@@ -35,12 +35,7 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-  APPDIR = ${shell echo %CD%}
-else
-  APPDIR = ${shell pwd}
-endif
-
+APPDIR = $(CURDIR)
 TOPDIR ?= $(APPDIR)/import
 -include $(TOPDIR)/Make.defs
 -include $(APPDIR)/Make.defs
diff --git a/graphics/littlevgl/Makefile b/graphics/littlevgl/Makefile
index 2b9f3d416..2a53f8010 100644
--- a/graphics/littlevgl/Makefile
+++ b/graphics/littlevgl/Makefile
@@ -55,7 +55,7 @@ LVGL_DIR = .
 
 # Set up build configuration and environment
 
-WD := ${shell pwd | sed -e 's/ /\\ /g'}
+WD := ${shell echo $(CURDIR) | sed -e 's/ /\\ /g'}
 
 CONFIG_GRAPH_LVGL_URL ?= "https://littlevgl.com/download/"
 
diff --git a/graphics/traveler/tools/libwld/Makefile b/graphics/traveler/tools/libwld/Makefile
index de639f6b0..ae2c26a0d 100644
--- a/graphics/traveler/tools/libwld/Makefile
+++ b/graphics/traveler/tools/libwld/Makefile
@@ -34,7 +34,7 @@
 #############################################################################
 
 
-WD       = ${shell pwd}
+WD       = $(CURDIR)
 TRAVELER = $(WD)/../..
 NUTTXDIR = $(WD)/../include
 
diff --git a/interpreters/ficl/Makefile b/interpreters/ficl/Makefile
index 256e63c25..f0fb94723 100644
--- a/interpreters/ficl/Makefile
+++ b/interpreters/ficl/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
-BUILDDIR := ${shell pwd | sed -e 's/ /\\ /g'}
+BUILDDIR := ${shell echo $(CURDIR) | sed -e 's/ /\\ /g'}
 
 -include $(TOPDIR)/Make.defs
 
diff --git a/netutils/cjson/Makefile b/netutils/cjson/Makefile
index ca8dba5e5..50b80fc12 100644
--- a/netutils/cjson/Makefile
+++ b/netutils/cjson/Makefile
@@ -39,7 +39,7 @@
 
 # Set up build configuration and environment
 
-WD := ${shell pwd | sed -e 's/ /\\ /g'}
+WD := ${shell echo $(CURDIR) | sed -e 's/ /\\ /g'}
 
 CONFIG_NETUTILS_CJSON_URL ?= "https://github.com/DaveGamble/cJSON/archive"
 CONFIG_NETUTILS_CJSON_VERSION ?= "1.7.10"
diff --git a/testing/unity/Makefile b/testing/unity/Makefile
index ab853157b..b71d03297 100644
--- a/testing/unity/Makefile
+++ b/testing/unity/Makefile
@@ -39,7 +39,7 @@
 
 # Set up build configuration and environment
 
-WD := ${shell pwd | sed -e 's/ /\\ /g'}
+WD := ${shell echo $(CURDIR) | sed -e 's/ /\\ /g'}
 
 CONFIG_TESTING_UNITY_URL ?= "https://github.com/ThrowTheSwitch/Unity/archive"
 CONFIG_TESTING_UNITY_VERSION ?= "2.4.3"