From ac9ec7b6e73dc5968b5500f8daf93155fb4699fe Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Thu, 5 Nov 2020 11:16:38 +0100
Subject: [PATCH] E3_REQUIRE_VERSION is now taken from CONFIG_MODULE instead of
 being defined separately in RELEASE

---
 configure/CONFIG_MODULE_DEV | 2 +-
 configure/RELEASE           | 2 +-
 configure/RELEASE_DEV       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure/CONFIG_MODULE_DEV b/configure/CONFIG_MODULE_DEV
index 3eefad3e..23621d36 100644
--- a/configure/CONFIG_MODULE_DEV
+++ b/configure/CONFIG_MODULE_DEV
@@ -6,7 +6,7 @@ E3_MODULE_SRC_PATH:=$(EPICS_MODULE_NAME)
 E3_MODULE_MAKEFILE:=$(EPICS_MODULE_NAME).Makefile
 
 E3_MODULE_NAME:=$(EPICS_MODULE_NAME)
-E3_MODULE_VERSION:=${E3_REQUIRE_VERSION}
+E3_MODULE_VERSION:=3.3.0
 #
 #
 #
diff --git a/configure/RELEASE b/configure/RELEASE
index 4a453d8d..cb131b5a 100644
--- a/configure/RELEASE
+++ b/configure/RELEASE
@@ -1,7 +1,7 @@
 EPICS_BASE=/epics/base-7.0.4
 
 E3_REQUIRE_NAME:=require
-E3_REQUIRE_VERSION:=3.3.0
+E3_REQUIRE_VERSION=$(E3_MODULE_VERSION)
 
 
 # The definitions shown below can also be placed in an untracked RELEASE.local
diff --git a/configure/RELEASE_DEV b/configure/RELEASE_DEV
index 02372aff..fc90b69c 100644
--- a/configure/RELEASE_DEV
+++ b/configure/RELEASE_DEV
@@ -1,7 +1,7 @@
 EPICS_BASE=/epics/base-7.0.4
 
 E3_REQUIRE_NAME:=require
-E3_REQUIRE_VERSION:=3.3.0
+E3_REQUIRE_VERSION=$(E3_MODULE_VERSION)
 
 
 # The definitions shown below can also be placed in an untracked RELEASE.local
-- 
GitLab