merge feature/changesAfter3_0_2; resolve conflicts

configure/CONFIG_SITE

@@ -14,11 +14,15 @@
 # Set CHECK_RELEASE to NO to disable checking completely.
 # Set CHECK_RELEASE to WARN to perform consistency checking but
 #   continue building anyway if conflicts are found.
-CHECK_RELEASE = YES
+#CHECK_RELEASE = YES
 
 # To install files into a location other than $(TOP) define
 #   INSTALL_LOCATION here.
 #INSTALL_LOCATION=</path/name/to/install/top>
 
+INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
+USR_INCLUDES += -I $(INSTALL_LOCATION)/include
+
+-include $(TOP)/../CONFIG_SITE.local
 -include $(TOP)/configure/CONFIG_SITE.local
--include $(TOP)/../CONFIG.local
+

configure/ExampleRELEASE.local

@@ -1,11 +1,8 @@
-# Sample RELEASE.local file
 
-V4 = /home/install/epics/v4
-
-PVASRV   = $(V4)/pvaSrv
-PVACCESS = $(V4)/pvAccessCPP
-PVDATA   = $(V4)/pvDataCPP
-PVCOMMON = $(V4)/pvCommonCPP
-
-EPICS_BASE = /home/install/epics/base-3.14.12.3
+TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
 
+EPICS_BASE=/home/install/epics/base
+PVCOMMON=/home/hg/pvCommonCPP
+PVDATA=/home/hg/pvDataCPP
+PVACCESS=/home/hg/pvAccessCPP
+PVASRV=/home/hg/pvaSrv

configure/RELEASE

@@ -24,5 +24,5 @@
 #   PVCOMMON = /path/to/epics/pvCommonCPP
 #   EPICS_BASE = /path/to/epics/base
 
--include $(TOP)/configure/RELEASE.local
 -include $(TOP)/../RELEASE.local
+-include $(TOP)/configure/RELEASE.local