Moved E3_MODULES_PATH to standard location

configure/CONFIG

@@ -18,6 +18,7 @@ include $(TOP)/configure/CONFIG_MODULE
 endif
 
 
+E3_MODULES_PATH:=$(EPICS_BASE)
 
 include $(EPICS_BASE)/configure/CONFIG_BASE_VERSION
 include $(TOP)/configure/E3/CONFIG_REQUIRE

configure/E3/CONFIG_E3_MAKEFILE

 # Pass necessary driver.makefile variables through makefile options
 #
 
-# Here, E3_MODULES_PATH is the same as E3_REQUIRE_LOCATION
-E3_MODULES_PATH:=$(EPICS_BASE)
-
 E3_REQUIRE_MAKEFILE_INPUT_OPTIONS := -C $(E3_MODULE_SRC_PATH)
 E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += -f $(E3_MODULE_MAKEFILE)
 E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += LIBVERSION="$(E3_MODULE_VERSION)"

configure/E3/CONFIG_E3_PATH

@@ -3,3 +3,12 @@
 E3_SITEMODS_PATH:=$(E3_REQUIRE_LOCATION)/siteMods
 E3_SITELIBS_PATH:=$(E3_REQUIRE_LOCATION)/siteLibs
 E3_SITEAPPS_PATH:=$(E3_REQUIRE_LOCATION)/siteApps
+
+E3_MODULES_INSTALL_LOCATION:=$(E3_MODULES_PATH)/$(E3_MODULE_NAME)/$(E3_MODULE_VERSION)
+
+E3_MODULES_INSTALL_LOCATION_INC:=$(E3_MODULES_INSTALL_LOCATION)/include
+E3_MODULES_INSTALL_LOCATION_DB:=$(E3_MODULES_INSTALL_LOCATION)/db
+E3_MODULES_INSTALL_LOCATION_BIN:=$(E3_MODULES_INSTALL_LOCATION)/bin
+E3_MODULES_INSTALL_LOCATION_LIB:=$(E3_MODULES_INSTALL_LOCATION)/lib
+
+EXPORT_VARS+=E3_MODULES_INSTALL_LOCATION_LIB

configure/modules/CONFIG

@@ -3,6 +3,8 @@
 # Update the module version (for numeric versions) with a build number of 0 if none is specified
 E3_MODULE_VERSION:=$(E3_MODULE_VERSION)$(shell [[ "$(E3_MODULE_VERSION)" =~ ^[0-9]+\.[0-9]+\.[0-9]+$$ ]] && echo +0)
 
+E3_MODULES_PATH?=$(E3_REQUIRE_LOCATION)/siteMods
+
 include $(EPICS_BASE)/configure/CONFIG_BASE_VERSION
 include $(REQUIRE_CONFIG)/CONFIG_REQUIRE
 include $(REQUIRE_CONFIG)/CONFIG_SHELL

configure/modules/CONFIG_E3_PATH

-## If E3_MODULES_PATH is not defined, we will use the
-## siteMods as the module path. This is valid for the
-## EPICS or E3 Modules
-## E3 Application should define in its own
-## E3_MODULES_PATH := $(E3_REQUIRE_LOCATION)/siteApps
-## in configure/CONFIG
-
-E3_MODULES_PATH?=$(E3_REQUIRE_LOCATION)/siteMods
 
 
 E3_SITEMODS_PATH:=$(E3_REQUIRE_LOCATION)/siteMods