diff --git a/configure/modules/CONFIG b/configure/modules/CONFIG index bd434649da5bb7376b09584806631a2122d02a0c..67177777676f16704c5950e544f39b00814901ad 100644 --- a/configure/modules/CONFIG +++ b/configure/modules/CONFIG @@ -1,11 +1,7 @@ # -*- mode: Makefile;-*- include $(REQUIRE_CONFIG)/CONFIG_REQUIRE - -ifneq (,$(findstring local,$(MAKECMDGOALS))) -E3_MODULES_PATH=$(TOP)/localMods -endif - +include $(REQUIRE_CONFIG)/CONFIG_CELL include $(REQUIRE_CONFIG)/CONFIG_E3_PATH include $(REQUIRE_CONFIG)/CONFIG_E3_MAKEFILE include $(REQUIRE_CONFIG)/CONFIG_EPICS diff --git a/configure/modules/CONFIG_CELL b/configure/modules/CONFIG_CELL new file mode 100644 index 0000000000000000000000000000000000000000..b858f656963d5c4fecec5afbd00b97a44c3e5162 --- /dev/null +++ b/configure/modules/CONFIG_CELL @@ -0,0 +1,15 @@ +# TOP is e3-MODULENAME +ifneq (,$(findstring cell,$(MAKECMDGOALS))) +## Default is e3-MODULENAME/cellMods +E3_CELL_PATH=$(TOP)/cellMods +## +## Allow local file in $(TOP)/configure +## local file in $(TOP)/../ +## +## Useful if one would like to install many different modules in +## a specific directory for massive debugging purpose +## +-include $(TOP)/../CONFIG_CELL.local +-include $(TOP)/configure/CONFIG_CELL.local +E3_MODULES_PATH=$(E3_CELL_PATH) +endif diff --git a/configure/modules/RULES_E3 b/configure/modules/RULES_E3 index d5ec111300561ce868d758eee590fa01c024e281..c0afafb13993e3b1d41aeaadff17b7da552a63ba 100644 --- a/configure/modules/RULES_E3 +++ b/configure/modules/RULES_E3 @@ -37,9 +37,9 @@ uninstall: conf $(QUIET) $(SUDOBASH) '$(E3_MODULE_MAKE_CMDS) uninstall' $(SUDO) find $(E3_SITELIBS_PATH) -xtype l -delete -localinstall: install_module +cellinstall: install_module -localuninstall: conf +celluninstall: conf $(QUIET) $(SUDOBASH) '$(E3_MODULE_MAKE_CMDS) uninstall' $(SUDO) rm -rf $(E3_MODULES_PATH) diff --git a/configure/modules/RULES_VARS b/configure/modules/RULES_VARS index 7d8b813ab3f5f9b14d357b9f3eb3d14c07eb5a15..76d7582f1c4e3c8c3a57446abd81be1e4eaaa570 100644 --- a/configure/modules/RULES_VARS +++ b/configure/modules/RULES_VARS @@ -28,3 +28,4 @@ else $(QUIET)tree -L $(LEVEL) $(E3_MODULES_PATH)/$(E3_MODULE_NAME) endif +cellvars: vars diff --git a/tools/iocsh_functions b/tools/iocsh_functions index 0b486f25d7a4ff1294fee5301a77986a6923abe9..b9c6f0d755d8893f7b3d897691c6dca6155b89ec 100644 --- a/tools/iocsh_functions +++ b/tools/iocsh_functions @@ -426,7 +426,7 @@ function loadFiles ;; ( -l ) shift - printf "epicsEnvSet EPICS_DRIVER_PATH ${EPICS_DRIVER_PATH}:%s\n", $1 + printf "epicsEnvSet EPICS_DRIVER_PATH %s:${EPICS_DRIVER_PATH}\n", $1 ;; ( -* ) printf "Unknown option $1\n\n" >&2