diff --git a/configure/modules/CONFIG b/configure/modules/CONFIG index 0d5dd895ff80526848ded71fe62e8e3fd6da4aa0..c94e975f25722df266c3ce38f7090cef6aa135e0 100644 --- a/configure/modules/CONFIG +++ b/configure/modules/CONFIG @@ -2,11 +2,11 @@ include $(EPICS_BASE)/configure/CONFIG_BASE_VERSION include $(REQUIRE_CONFIG)/CONFIG_REQUIRE +include $(REQUIRE_CONFIG)/CONFIG_SUDO include $(REQUIRE_CONFIG)/CONFIG_CELL include $(REQUIRE_CONFIG)/CONFIG_E3_PATH include $(REQUIRE_CONFIG)/CONFIG_E3_MAKEFILE include $(REQUIRE_CONFIG)/CONFIG_EPICS -include $(REQUIRE_CONFIG)/CONFIG_SUDO include $(REQUIRE_CONFIG)/CONFIG_DKMS include $(REQUIRE_CONFIG)/CONFIG_EXPORT diff --git a/configure/modules/CONFIG_CELL b/configure/modules/CONFIG_CELL index b858f656963d5c4fecec5afbd00b97a44c3e5162..1f2682b46c2879f509d05f442ef73c0e8b3a9bc3 100644 --- a/configure/modules/CONFIG_CELL +++ b/configure/modules/CONFIG_CELL @@ -12,4 +12,8 @@ E3_CELL_PATH=$(TOP)/cellMods -include $(TOP)/../CONFIG_CELL.local -include $(TOP)/configure/CONFIG_CELL.local E3_MODULES_PATH=$(E3_CELL_PATH) + +# If we are doing cellinstall, we should not use SUDO. This is a local install. +SUDO= + endif diff --git a/configure/modules/CONFIG_SUDO b/configure/modules/CONFIG_SUDO index c346b2953fd1308cc935d1503e1597288ac6c16e..146ebccb2345162fa83ca2cffa8104d7df5a7726 100644 --- a/configure/modules/CONFIG_SUDO +++ b/configure/modules/CONFIG_SUDO @@ -13,7 +13,7 @@ SUDO = $(SUDO_CMD) else SUDO = $(SUDO_CMD) -E endif -SUDOBASH := $(SUDO) bash -c +SUDOBASH = $(SUDO) bash -c else SUDO := SUDOBASH = bash -c