diff --git a/Makefile b/Makefile
index bee3a67..8b74cc0 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ include $(TOP)/configure/CONFIG
 DIRS += configure
 
 DIRS += src
-pvDataApp_DEPEND_DIRS = configure
+src_DEPEND_DIRS = configure
 
 DIRS += testApp
 testApp_DEPEND_DIRS = src
diff --git a/src/Makefile b/src/Makefile
index 286e6d1..617beb2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,14 +3,14 @@
 TOP = ..
 include $(TOP)/configure/CONFIG
 
-PVDATASRC = $(TOP)/src
+PVDATA_SRC = $(TOP)/src
 
-include $(PVDATASRC)/misc/Makefile
-include $(PVDATASRC)/pv/Makefile
-include $(PVDATASRC)/factory/Makefile
-include $(PVDATASRC)/property/Makefile
-include $(PVDATASRC)/pvMisc/Makefile
-include $(PVDATASRC)/monitor/Makefile
+include $(PVDATA_SRC)/misc/Makefile
+include $(PVDATA_SRC)/pv/Makefile
+include $(PVDATA_SRC)/factory/Makefile
+include $(PVDATA_SRC)/property/Makefile
+include $(PVDATA_SRC)/pvMisc/Makefile
+include $(PVDATA_SRC)/monitor/Makefile
 
 LIBRARY = pvData
 pvData_LIBS += Com
diff --git a/src/factory/Makefile b/src/factory/Makefile
index 3b51d4e..8c9678b 100644
--- a/src/factory/Makefile
+++ b/src/factory/Makefile
@@ -1,6 +1,6 @@
 # This is a Makefile fragment, see ../Makefile
 
-SRC_DIRS += $(PVDATASRC)/factory
+SRC_DIRS += $(PVDATA_SRC)/factory
 
 INC += factory.h
 LIBSRCS += TypeFunc.cpp
diff --git a/src/misc/Makefile b/src/misc/Makefile
index 829d6a5..e5c748d 100644
--- a/src/misc/Makefile
+++ b/src/misc/Makefile
@@ -1,6 +1,6 @@
 # This is a Makefile fragment, see ../Makefile
 
-SRC_DIRS += $(PVDATASRC)/misc
+SRC_DIRS += $(PVDATA_SRC)/misc
 
 INC += noDefaultMethods.h
 INC += lock.h
diff --git a/src/monitor/Makefile b/src/monitor/Makefile
index 54387fa..01670ae 100644
--- a/src/monitor/Makefile
+++ b/src/monitor/Makefile
@@ -1,6 +1,6 @@
 # This is a Makefile fragment, see ../Makefile
 
-SRC_DIRS += $(PVDATASRC)/monitor
+SRC_DIRS += $(PVDATA_SRC)/monitor
 
 INC += monitor.h
 
diff --git a/src/property/Makefile b/src/property/Makefile
index eae0c9f..f417542 100644
--- a/src/property/Makefile
+++ b/src/property/Makefile
@@ -1,6 +1,6 @@
 # This is a Makefile fragment, see ../Makefile
 
-SRC_DIRS += $(PVDATASRC)/property
+SRC_DIRS += $(PVDATA_SRC)/property
 
 INC += alarm.h
 INC += pvAlarm.h
diff --git a/src/pv/Makefile b/src/pv/Makefile
index 87da8ae..00719b4 100644
--- a/src/pv/Makefile
+++ b/src/pv/Makefile
@@ -1,6 +1,6 @@
 # This is a Makefile fragment, see ../Makefile
 
-SRC_DIRS += $(PVDATASRC)/pv
+SRC_DIRS += $(PVDATA_SRC)/pv
 
 INC += pvType.h
 INC += pvIntrospect.h
diff --git a/src/pvMisc/Makefile b/src/pvMisc/Makefile
index 859b94c..6809118 100644
--- a/src/pvMisc/Makefile
+++ b/src/pvMisc/Makefile
@@ -1,6 +1,6 @@
 # This is a Makefile fragment, see ../Makefile
 
-SRC_DIRS += $(PVDATASRC)/pvMisc
+SRC_DIRS += $(PVDATA_SRC)/pvMisc
 
 INC += bitSetUtil.h