--- a/configure/RELEASE	Mon Jun 27 18:08:05 2016 +0200
+++ b/configure/RELEASE	Thu Jul 05 08:48:18 2018 +0000
@@ -19,7 +19,7 @@
 # Build settings that are NOT module paths should appear in a
 # CONFIG_SITE file.
 
-TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
+TEMPLATE_TOP=${EPICS_HOME}/templates/makeBaseApp/top
 
 HOME=/home/epics/
 MODULES=$(HOME)/EPICS/modules
@@ -30,9 +30,10 @@
 ASYN=$(SUPPORT)/asyn4-26
 STREAM=$(SUPPORT)/stream
 EUROTHERM2K=$(SUPPORT)/eurotherm2k-1-18
+CALC=$(SUPPORT)/calc-3-4-2
 
 # EPICS_BASE usually appears last so other apps can override stuff:
-EPICS_BASE=$(HOME)/EPICS/base
+EPICS_BASE=${EPICS_HOME}
 
 # Set RULES here if you want to take build rules from somewhere
 # other than EPICS_BASE: