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

Removed SUDO from cellinstall

parent 7b0ad2b2
No related branches found
No related tags found
1 merge request!23.3.0
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
include $(EPICS_BASE)/configure/CONFIG_BASE_VERSION include $(EPICS_BASE)/configure/CONFIG_BASE_VERSION
include $(REQUIRE_CONFIG)/CONFIG_REQUIRE include $(REQUIRE_CONFIG)/CONFIG_REQUIRE
include $(REQUIRE_CONFIG)/CONFIG_SUDO
include $(REQUIRE_CONFIG)/CONFIG_CELL include $(REQUIRE_CONFIG)/CONFIG_CELL
include $(REQUIRE_CONFIG)/CONFIG_E3_PATH include $(REQUIRE_CONFIG)/CONFIG_E3_PATH
include $(REQUIRE_CONFIG)/CONFIG_E3_MAKEFILE include $(REQUIRE_CONFIG)/CONFIG_E3_MAKEFILE
include $(REQUIRE_CONFIG)/CONFIG_EPICS include $(REQUIRE_CONFIG)/CONFIG_EPICS
include $(REQUIRE_CONFIG)/CONFIG_SUDO
include $(REQUIRE_CONFIG)/CONFIG_DKMS include $(REQUIRE_CONFIG)/CONFIG_DKMS
include $(REQUIRE_CONFIG)/CONFIG_EXPORT include $(REQUIRE_CONFIG)/CONFIG_EXPORT
......
...@@ -12,4 +12,8 @@ E3_CELL_PATH=$(TOP)/cellMods ...@@ -12,4 +12,8 @@ E3_CELL_PATH=$(TOP)/cellMods
-include $(TOP)/../CONFIG_CELL.local -include $(TOP)/../CONFIG_CELL.local
-include $(TOP)/configure/CONFIG_CELL.local -include $(TOP)/configure/CONFIG_CELL.local
E3_MODULES_PATH=$(E3_CELL_PATH) E3_MODULES_PATH=$(E3_CELL_PATH)
# If we are doing cellinstall, we should not use SUDO. This is a local install.
SUDO=
endif endif
...@@ -13,7 +13,7 @@ SUDO = $(SUDO_CMD) ...@@ -13,7 +13,7 @@ SUDO = $(SUDO_CMD)
else else
SUDO = $(SUDO_CMD) -E SUDO = $(SUDO_CMD) -E
endif endif
SUDOBASH := $(SUDO) bash -c SUDOBASH = $(SUDO) bash -c
else else
SUDO := SUDO :=
SUDOBASH = bash -c SUDOBASH = bash -c
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment