Skip to content
Snippets Groups Projects
Commit 63d3bf13 authored by Simon Rose's avatar Simon Rose
Browse files

Force user to uninstall siteMods before uninstalling require

parent d150a8f9
No related branches found
No related tags found
1 merge request!4Bugfixes
Hide whitespace changes
Inline Side-by-side
configure/E3/RULES_E3
+ 6
− 0
View file @ 63d3bf13
...@@ -34,7 +34,13 @@ install: requireconf ...@@ -34,7 +34,13 @@ install: requireconf
## Uninstall : $(E3_MODULE_NAME) ## Uninstall : $(E3_MODULE_NAME)
uninstall: conf uninstall: conf
#ifeq (,$(strip $(wildcard $(E3_SITEMODS_PATH)/*) $(wildcard $(E3_SITEAPPS_PATH)/*) $(wildcard $(E3_SITELIBS_PATH)/*)))
ifeq (,$(strip $(wildcard $(E3_SITEMODS_PATH)/*)))
$(QUIET) $(SUDOBASH) '$(E3_MODULE_MAKE_CMDS) uninstall' $(QUIET) $(SUDOBASH) '$(E3_MODULE_MAKE_CMDS) uninstall'
else
#$(error Cannot run 'make uninstall': please manually uninstall everything in siteMods, siteApps, and siteLibs.)
$(error Cannot run 'make uninstall': please manually uninstall everything in siteMods)
endif
## Build the EPICS Module : $(E3_MODULE_NAME) ## Build the EPICS Module : $(E3_MODULE_NAME)
......
configure/modules/RULES_E3_SITELIBS
+ 1
− 1
View file @ 63d3bf13
...@@ -14,7 +14,7 @@ install_links: $(INSTALLED_EPICS_BASE_ARCHS) hdrs ...@@ -14,7 +14,7 @@ install_links: $(INSTALLED_EPICS_BASE_ARCHS) hdrs
$(INSTALLED_EPICS_BASE_ARCHS): $(INSTALLED_EPICS_BASE_ARCHS):
$(SUDO) mkdir -p $(E3_SITELIBS_PATH)/$@ # $(SUDO) mkdir -p $(E3_SITELIBS_PATH)/$@
# $(SUDO) ln -sf $(E3_MODULES_INSTALL_LOCATION)/lib/$@/$(E3_MODULES_LIBNAME) $(E3_SITELIBS_PATH)/$@/$(E3_MODULES_LIBLINKNAME) # $(SUDO) ln -sf $(E3_MODULES_INSTALL_LOCATION)/lib/$@/$(E3_MODULES_LIBNAME) $(E3_SITELIBS_PATH)/$@/$(E3_MODULES_LIBLINKNAME)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment