diff --git a/configure/E3/RULES_E3 b/configure/E3/RULES_E3 index 8f837de5507bf3045aedb5c63326805cf5aabbf5..17ec5f390eda9d5ed3cab23d16d441903e28c2ae 100644 --- a/configure/E3/RULES_E3 +++ b/configure/E3/RULES_E3 @@ -34,7 +34,13 @@ install: requireconf ## Uninstall : $(E3_MODULE_NAME) 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' +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) diff --git a/configure/modules/RULES_E3_SITELIBS b/configure/modules/RULES_E3_SITELIBS index cb775e478b0646c2e88e49cd0ac9100375da2a7d..636f73f26d7be134ea361216517fe195e469bef9 100644 --- a/configure/modules/RULES_E3_SITELIBS +++ b/configure/modules/RULES_E3_SITELIBS @@ -14,7 +14,7 @@ install_links: $(INSTALLED_EPICS_BASE_ARCHS) hdrs $(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)