diff --git a/configure/CONFIG b/configure/CONFIG index c4970f13e545cfc406742ae42330430866bbd637..6c3ba7cd401f2440922090eb9da5dda0a037f141 100644 --- a/configure/CONFIG +++ b/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 diff --git a/configure/E3/CONFIG_E3_MAKEFILE b/configure/E3/CONFIG_E3_MAKEFILE index 1e8aad839c5229ca23ea24a1651d6231afecb138..f3d6ba4b6dc5230b20519468f7d7bf27325ed657 100644 --- a/configure/E3/CONFIG_E3_MAKEFILE +++ b/configure/E3/CONFIG_E3_MAKEFILE @@ -1,9 +1,6 @@ # 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)" diff --git a/configure/E3/CONFIG_E3_PATH b/configure/E3/CONFIG_E3_PATH index ec621bda6661ae6aa7beabeb1d46f8b6499483ee..43e724ec3742ad84de80b6225c4ee2e1fa0bafba 100644 --- a/configure/E3/CONFIG_E3_PATH +++ b/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 diff --git a/configure/modules/CONFIG b/configure/modules/CONFIG index 377f34b3e52ddbdfb0d5fb137525db105957652a..d8dac693e96d7a17b63a328c31736be6a36da429 100644 --- a/configure/modules/CONFIG +++ b/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 diff --git a/configure/modules/CONFIG_E3_PATH b/configure/modules/CONFIG_E3_PATH index 41abeb90ed2467b83efb4c43475032f29a9fdeb7..43e724ec3742ad84de80b6225c4ee2e1fa0bafba 100644 --- a/configure/modules/CONFIG_E3_PATH +++ b/configure/modules/CONFIG_E3_PATH @@ -1,11 +1,3 @@ -## 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