diff --git a/src/gdd/Makefile b/src/gdd/Makefile
index 9c5638eb4..ec6988b46 100644
--- a/src/gdd/Makefile
+++ b/src/gdd/Makefile
@@ -7,7 +7,7 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 
-TOP=../../../..
+TOP=../..
 
 include $(TOP)/configure/CONFIG
 
diff --git a/src/pcas/Makefile b/src/pcas/Makefile
index 04884424e..e6fd6ea91 100644
--- a/src/pcas/Makefile
+++ b/src/pcas/Makefile
@@ -7,7 +7,7 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 
-TOP=../../../..
+TOP=../..
 
 include $(TOP)/configure/CONFIG
 
diff --git a/src/pcas/build/Makefile b/src/pcas/build/Makefile
index e30560882..b040bdf7a 100644
--- a/src/pcas/build/Makefile
+++ b/src/pcas/build/Makefile
@@ -5,12 +5,11 @@
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE Versions 3.13.7
 # and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
-TOP := ../../../../..
-CAS := $(TOP)/src/ca/legacy/pcas
+TOP := ../../..
+CAS := $(TOP)/src/pcas
 SRC := $(CAS)/generic
-CA := $(TOP)/src/ca/client
 IOSRC := $(CAS)/io/bsdSocket
 STSRC := $(SRC)/st
 
@@ -19,7 +18,6 @@ include $(TOP)/configure/CONFIG
 SRC_DIRS += $(SRC)
 SRC_DIRS += $(IOSRC)
 SRC_DIRS += $(STSRC)
-SRC_DIRS += $(CA)
 
 #USR_CXXFLAGS = $(USR_CFLAGS)
 
@@ -50,7 +48,7 @@ LIBSRCS += casMonitor.cc
 LIBSRCS += casMonEvent.cc
 LIBSRCS += inBuf.cc
 LIBSRCS += outBuf.cc
-LIBSRCS += casCtx.cc 
+LIBSRCS += casCtx.cc
 LIBSRCS += casEventMask.cc
 LIBSRCS += ioBlocked.cc
 LIBSRCS += pvExistReturn.cc
diff --git a/src/pcas/example/Makefile b/src/pcas/example/Makefile
index 9ec9d6b6a..8f4cc5100 100644
--- a/src/pcas/example/Makefile
+++ b/src/pcas/example/Makefile
@@ -8,7 +8,7 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 
-TOP=../../../../..
+TOP=../../..
 
 include $(TOP)/configure/CONFIG
 
diff --git a/src/pcas/example/directoryService/Makefile b/src/pcas/example/directoryService/Makefile
index d7abb96b2..5fcdf7ff6 100644
--- a/src/pcas/example/directoryService/Makefile
+++ b/src/pcas/example/directoryService/Makefile
@@ -5,10 +5,10 @@
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE Versions 3.13.7
 # and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-TOP=../../../../../..
+TOP=../../../..
 
 include $(TOP)/configure/CONFIG
 
@@ -28,10 +28,9 @@ caDirServ_SRCS += directoryServer.cc
 
 PROD_HOST = caDirServ
 
-CLEANS += caDirServ pcaDirServ Templates.DB core 
+CLEANS += caDirServ pcaDirServ Templates.DB core
 
 include $(TOP)/configure/RULES
 
 pcaDirServ: $(PRODUCT_OBJS) $(PROD_RESS) $(PROD_DEPLIBS)
 	$(PURIFY_$(OS_CLASS)) $(LINK.cpp)
-