From 8f2c9c222a0cd8f0d78c1fc7ebf278404661d9dd Mon Sep 17 00:00:00 2001
From: Jeong Han Lee <jeonghan.lee@gmail.com>
Date: Wed, 18 Oct 2017 21:19:10 +0200
Subject: [PATCH] update CONFIG in orde to use global variable

---
 Makefile         |  9 ++++++---
 configure/CONFIG | 17 ++++++++++++-----
 ess-env.conf     |  2 +-
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 1210a750..a4874d1b 100644
--- a/Makefile
+++ b/Makefile
@@ -16,16 +16,18 @@
 #
 # Author  : Jeong Han Lee
 # email   : han.lee@esss.se
-# Date    : Friday, October  6 13:35:46 CEST 2017
-# version : 0.1.0
+# Date    : Wednesday, October 18 21:17:45 CEST 2017
+# version : 0.1.1
 #
 
 TOP:=$(CURDIR)
 
+
 include $(TOP)/configure/CONFIG
 
 -include $(TOP)/$(E3_ENV_NAME)/$(E3_ENV_NAME)
 
+
 #
 # Keep always the module up-to-date
 define git_update =
@@ -106,7 +108,7 @@ install: uninstall
 	$(QUIET) sed -i 's/^IOCSH_HASH_VERSION=.*/IOCSH_HASH_VERSION=$(IOCSH_HASH_VERSION)/g' $(TOP)/ess-env.conf
 	$(QUIET) sudo install -m 644  $(TOP)/ess-env.conf     $(REQUIRE_BIN)/
 	$(QUIET) sudo install -m 644  $(TOP)/iocsh_functions  $(REQUIRE_BIN)/
-	$(QUIET) sudo install -m 644  $(TOP)/$(E3_ENV_NAME)/setE3Env.bash  $(REQUIRE_BIN)/	
+	$(QUIET) sudo install -m 644  $(TOP)/$(E3_ENV_NAME)/setE3Env.bash  $(REQUIRE_BIN)/
 #
 ## Uninstall "Require" Module in order not to use it
 uninstall: conf
@@ -135,6 +137,7 @@ git-submodule-sync:
 	$(QUIET) git submodule sync
 
 
+
 $(EPICS_MODULE_NAME): 
 	$(QUIET) $(git_update)
 	cd $@ && git checkout $(REQUIRE_MODULE_TAG)
diff --git a/configure/CONFIG b/configure/CONFIG
index f3599088..21811b7e 100644
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -3,13 +3,20 @@
 # For example, https://github.com/epics-module/devlib2
 # devlib2 is EPICS_MODULE_NAME
 # 
-EPICS_MODULE_NAME:=require
+EPICS_MODULE_NAME:=$(REQUIRE)
 
-# # (EPICS) EPICS_MODULE_TAG
-# # The EPICS community tag number, which we would like to install
-# # within ESS EPICS Environment (ESS)
+# (EPICS) EPICS_MODULE_TAG
+# The EPICS community tag number, which we would like to install
+# within ESS EPICS Environment (ESS)
+
+# This is the module source tag
+# *) individual tags
+#    export EPICS_MODULE_TAG:=tags/require_2_5_3
+# *) master branch 
+#    export EPICS_MODULE_TAG:=master
+# *) individual hash 
+export EPICS_MODULE_TAG:=$(REQUIRE_MODULE_TAG)
 
-# export EPICS_MODULE_TAG:=require_2_5_3
 
 # (LOCAL) EPICS_MODULE_PATH
 # Usually, it is the directory in $(TOP), after cloning the repository
diff --git a/ess-env.conf b/ess-env.conf
index 195f5b78..97874819 100644
--- a/ess-env.conf
+++ b/ess-env.conf
@@ -4,4 +4,4 @@ EPICS_LOCATION=/e3/bases
 EPICS_MODULES=/e3/modules
 
 REQUIRE=require
-IOCSH_HASH_VERSION=b93c6be
+IOCSH_HASH_VERSION=4126994
-- 
GitLab