diff --git a/configure/modules/CONFIG_CELL b/configure/modules/CONFIG_CELL index 634d13b90ee5796e078488ac7933de75e7828248..d21f799a1d7f101909ef59824566a5b877fed57f 100644 --- a/configure/modules/CONFIG_CELL +++ b/configure/modules/CONFIG_CELL @@ -1,4 +1,3 @@ -.PHONY: fix_permissions cellinstall celluninstall # TOP is e3-MODULENAME ifneq (,$(findstring cell,$(MAKECMDGOALS))) @@ -18,19 +17,4 @@ E3_MODULES_PATH=$(E3_CELL_PATH) # If we are doing cellinstall, we should not use SUDO. This is a local install. SUDO= -cellinstall: install_module versions fix_permissions - -celluninstall: conf - $(QUIET) $(SUDOBASH) '$(E3_MODULE_MAKE_CMDS) uninstall' - $(SUDO) rm -rf $(E3_MODULES_PATH) - -versions: - @echo EPICS_BASE: $(EPICS_BASE) > $(E3_CELL_PATH)/$(E3_MODULE_NAME)/$(E3_MODULE_VERSION)/EPICS_VERSION - @echo E3_REQUIRE_VERSION: $(E3_REQUIRE_VERSION) >> $(E3_CELL_PATH)/$(E3_MODULE_NAME)/$(E3_MODULE_VERSION)/EPICS_VERSION - -# cellinstall should install as read/write, but install does everything by default read-only -fix_permissions: - @echo "Updating permissions on cellMods directory $(E3_CELL_PATH)/$(E3_MODULE_NAME)" - $(QUIET) chmod -R u+w $(E3_CELL_PATH)/$(E3_MODULE_NAME) - endif diff --git a/configure/modules/RULES_CELL b/configure/modules/RULES_CELL new file mode 100644 index 0000000000000000000000000000000000000000..22b1cd8c960dc034e0f18b545f8a3c86c70d800c --- /dev/null +++ b/configure/modules/RULES_CELL @@ -0,0 +1,20 @@ +.PHONY: fix_permissions cellinstall celluninstall + +ifneq (,$(findstring cell,$(MAKECMDGOALS))) + +cellinstall: install_module versions fix_permissions + +celluninstall: conf + $(QUIET) $(SUDOBASH) '$(E3_MODULE_MAKE_CMDS) uninstall' + $(SUDO) rm -rf $(E3_MODULES_PATH) + +versions: + @echo EPICS_BASE: $(EPICS_BASE) > $(E3_CELL_PATH)/$(E3_MODULE_NAME)/$(E3_MODULE_VERSION)/EPICS_VERSION + @echo E3_REQUIRE_VERSION: $(E3_REQUIRE_VERSION) >> $(E3_CELL_PATH)/$(E3_MODULE_NAME)/$(E3_MODULE_VERSION)/EPICS_VERSION + +# cellinstall should install as read/write, but install does everything by default read-only +fix_permissions: + @echo "Updating permissions on cellMods directory $(E3_CELL_PATH)/$(E3_MODULE_NAME)" + $(QUIET) chmod -R u+w $(E3_CELL_PATH)/$(E3_MODULE_NAME) + +endif diff --git a/configure/modules/RULES_SITEMODS b/configure/modules/RULES_SITEMODS index f1670e26856b41d1142a25e6da337f0d33ef4cad..864d26cad25d632122a09a00cbef413ed92d2218 100644 --- a/configure/modules/RULES_SITEMODS +++ b/configure/modules/RULES_SITEMODS @@ -1,6 +1,7 @@ # -*- mode: Makefile;-*- include $(REQUIRE_CONFIG)/RULES_E3 +include $(REQUIRE_CONFIG)/RULES_CELL include $(REQUIRE_CONFIG)/DEFINES_FT include $(REQUIRE_CONFIG)/RULES_PATCH include $(REQUIRE_CONFIG)/RULES_E3_SITELIBS