diff --git a/util/m5/Makefile.aarch64 b/util/m5/Makefile.aarch64
index 08180665a..d1492f073 100644
--- a/util/m5/Makefile.aarch64
+++ b/util/m5/Makefile.aarch64
@@ -55,7 +55,7 @@ JR=jar
 #JDK_PATH=/path/to/jdk/version_number
 
 CFLAGS=-O2 -I $(JDK_PATH)/include/ -I $(JDK_PATH)/include/linux \
-       -I$(PWD)/../../include -march=armv8-a
+       -I$(CURDIR)/../../include -march=armv8-a
 LDFLAGS=-static -L. -lm5
 
 LIB_OBJS=m5op_arm_A64.o m5_mmap.o
diff --git a/util/m5/Makefile.alpha b/util/m5/Makefile.alpha
index c21f67cf1..5f8f35324 100644
--- a/util/m5/Makefile.alpha
+++ b/util/m5/Makefile.alpha
@@ -35,7 +35,7 @@ CC=$(CROSS_COMPILE)gcc
 AS=$(CROSS_COMPILE)as
 LD=$(CROSS_COMPILE)ld
 
-CFLAGS=-O2 -I$(PWD)/../../include
+CFLAGS=-O2 -I$(CURDIR)/../../include
 OBJS=m5.o m5op_alpha.o m5_mmap.o
 
 all: m5
diff --git a/util/m5/Makefile.arm b/util/m5/Makefile.arm
index 14d73538b..7e8b4a8db 100644
--- a/util/m5/Makefile.arm
+++ b/util/m5/Makefile.arm
@@ -55,7 +55,7 @@ JR=jar
 #JDK_PATH=/path/to/jdk/version_number
 
 CFLAGS=-O2 -I $(JDK_PATH)/include/ -I $(JDK_PATH)/include/linux \
-       -I$(PWD)/../../include -march=armv7-a
+       -I$(CURDIR)/../../include -march=armv7-a
 LDFLAGS=-L. -lm5 -static
 
 LIB_OBJS=m5op_arm.o m5_mmap.o
diff --git a/util/m5/Makefile.sparc b/util/m5/Makefile.sparc
index e1b17ea2c..b486dc068 100644
--- a/util/m5/Makefile.sparc
+++ b/util/m5/Makefile.sparc
@@ -35,7 +35,7 @@ CC=$(CROSS_COMPILE)gcc
 AS=$(CROSS_COMPILE)as
 LD=$(CROSS_COMPILE)ld
 
-CFLAGS=-O2 -m64 -I$(PWD)/../../include
+CFLAGS=-O2 -m64 -I$(CURDIR)/../../include
 OBJS=m5.o m5op_sparc.o m5_mmap.o
 
 all: m5
diff --git a/util/m5/Makefile.thumb b/util/m5/Makefile.thumb
index 60b6803b2..4c753e4f6 100644
--- a/util/m5/Makefile.thumb
+++ b/util/m5/Makefile.thumb
@@ -49,8 +49,8 @@ AS=$(CROSS_COMPILE)as
 LD=$(CROSS_COMPILE)ld
 AR=$(CROSS_COMPILE)ar
 
-#CFLAGS=-O2 -march=armv7 -mthumb -I$(PWD)/../../include
-CFLAGS=-O2 -mthumb -I$(PWD)/../../include
+#CFLAGS=-O2 -march=armv7 -mthumb -I$(CURDIR)/../../include
+CFLAGS=-O2 -mthumb -I$(CURDIR)/../../include
 LDFLAGS=-L. -lm5
 
 OBJS=m5.o
diff --git a/util/m5/Makefile.x86 b/util/m5/Makefile.x86
index 890e4b151..522370f09 100644
--- a/util/m5/Makefile.x86
+++ b/util/m5/Makefile.x86
@@ -31,7 +31,7 @@ CC=gcc
 AS=as
 LD=ld
 
-CFLAGS=-O2 -DM5OP_ADDR=0xFFFF0000 -I$(PWD)/../../include
+CFLAGS=-O2 -DM5OP_ADDR=0xFFFF0000 -I$(CURDIR)/../../include
 OBJS=m5.o m5op_x86.o m5_mmap.o
 LUA_HEADER_INCLUDE=$(shell pkg-config --cflags-only-I lua51)
 LUA_OBJS=lua_gem5Op.opic m5op_x86.opic m5_mmap.opic