diff --git a/Makefile b/Makefile
index 247c705..be859f2 100644
--- a/Makefile
+++ b/Makefile
@@ -4,21 +4,24 @@ DIRS = src
 streamApp_DEPEND_DIRS  = src
 
 # Look if we have EPICS R3.13 or R3.14
-ifeq ($(wildcard $(TOP)/configure),)
+ifneq ($(wildcard $(TOP)/configure),)
+  # EPICS R3.14
+  include $(TOP)/configure/CONFIG
+else ifneq ($(wildcard $(TOP)/config),)
   # EPICS R3.13
   include $(TOP)/config/CONFIG_APP
   CONFIG = $(TOP)/config
 else
-  # EPICS R3.14
+  TOP = .
   include $(TOP)/configure/CONFIG
-  ifneq ($(words $(CALC) $(SYNAPPS)), 0)
-    # with synApps calc module (contains scalcout)
-    DIRS += srcSynApps
-    srcSynApps_DEPEND_DIRS  = src
-    streamApp_DEPEND_DIRS  += srcSynApps
-  endif
 endif
 
 DIRS += streamApp
+ifneq ($(words $(CALC) $(SYNAPPS)), 0)
+# with synApps calc module (contains scalcout)
+DIRS += srcSynApps
+srcSynApps_DEPEND_DIRS  = src
+streamApp_DEPEND_DIRS  += srcSynApps
+endif
 
 include $(CONFIG)/RULES_DIRS
diff --git a/configure/RELEASE b/configure/RELEASE
index 62951a3..2816ca9 100644
--- a/configure/RELEASE
+++ b/configure/RELEASE
@@ -16,3 +16,4 @@ TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
 
 # EPICS_BASE usually appears last so other apps can override stuff:
 EPICS_BASE=/usr/local/epics/base-3.14.12
+CALC=~/top/SynApps/calc-2-8
diff --git a/src/Makefile b/src/Makefile
index ed146e0..0ae8e3f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -18,7 +18,7 @@
 #                                                              #
 ################################################################
 
-TOP=../..
+TOP:=../$(TOP)
 
 # Look if we have EPICS R3.13 or R3.14
 ifeq ($(wildcard $(TOP)/configure),)
diff --git a/srcSynApps/Makefile b/srcSynApps/Makefile
index 4fec9f9..719ce5c 100644
--- a/srcSynApps/Makefile
+++ b/srcSynApps/Makefile
@@ -1,4 +1,4 @@
-TOP=../..
+TOP:=../$(TOP)
 
 include $(TOP)/configure/CONFIG
 
diff --git a/streamApp/Makefile b/streamApp/Makefile
index 1981c42..b9045ea 100644
--- a/streamApp/Makefile
+++ b/streamApp/Makefile
@@ -1,4 +1,4 @@
-TOP=../..
+TOP:=../$(TOP)
 
 # Look if we have EPICS R3.13 or R3.14
 ifeq ($(wildcard $(TOP)/configure),)