From cc3e1039cea66aec9abce2ac454c83272e5ea65a Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@anl.gov>
Date: Mon, 17 May 2021 12:13:53 -0500
Subject: [PATCH] checkRelease(): expand EPICS_BASE checks

---
 src/tools/convertRelease.pl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/tools/convertRelease.pl b/src/tools/convertRelease.pl
index bc20bc69c..b8c596edb 100644
--- a/src/tools/convertRelease.pl
+++ b/src/tools/convertRelease.pl
@@ -227,6 +227,12 @@ sub envPaths {
 # Check RELEASE file consistency with support modules
 #
 sub checkRelease {
+    die "\nEPICS_BASE must be set in a configure/RELEASE file.\n\n"
+        unless grep(m/^(EPICS_BASE)$/, @apps) &&
+            exists $macros{EPICS_BASE} &&
+            $macros{EPICS_BASE} ne '' &&
+            -f "$macros{EPICS_BASE}/configure/CONFIG_BASE";
+
     my $status = 0;
     delete $macros{RULES};
     delete $macros{TOP};
@@ -256,9 +262,6 @@ sub checkRelease {
     }
 
     my @modules = grep(!m/^(RULES|TOP|TEMPLATE_TOP)$/, @apps);
-    if (!@modules) {
-        die "No variables defined in RELEASE*s";
-    }
     my $app = shift @modules;
     my $latest = AbsPath($macros{$app});
     my %paths = ($latest => $app);