diff --git a/configure/modules/CONFIG_E3_PATH b/configure/modules/CONFIG_E3_PATH index de9562e685e8deaf908714fbd66e2ce30c7a4eda..820deff1ad85c438a221f3da2e88bddb9db03d97 100644 --- a/configure/modules/CONFIG_E3_PATH +++ b/configure/modules/CONFIG_E3_PATH @@ -12,7 +12,6 @@ E3_SITEMODS_PATH:=$(E3_REQUIRE_LOCATION)/siteMods E3_SITELIBS_PATH:=$(E3_REQUIRE_LOCATION)/siteLibs E3_SITEAPPS_PATH:=$(E3_REQUIRE_LOCATION)/siteApps -E3_MODULES_VENDOR_LIBS_LOCATION:=$(E3_SITELIBS_PATH)/vendor/$(E3_MODULE_NAME)/$(E3_MODULE_VERSION) E3_MODULES_INSTALL_LOCATION:=$(E3_MODULES_PATH)/$(E3_MODULE_NAME)/$(E3_MODULE_VERSION) E3_MODULES_INSTALL_LOCATION_INC:=$(E3_MODULES_INSTALL_LOCATION)/include @@ -20,6 +19,5 @@ E3_MODULES_INSTALL_LOCATION_DB:=$(E3_MODULES_INSTALL_LOCATION)/db E3_MODULES_INSTALL_LOCATION_BIN:=$(E3_MODULES_INSTALL_LOCATION)/bin E3_MODULES_INSTALL_LOCATION_LIB:=$(E3_MODULES_INSTALL_LOCATION)/lib -EXPORT_VARS+=E3_MODULES_VENDOR_LIBS_LOCATION EXPORT_VARS+=E3_MODULES_INSTALL_LOCATION_LIB diff --git a/require-ess/tools/driver.makefile b/require-ess/tools/driver.makefile index 1cded81ba8709f572e4ee26eeb5d26dcd9b051aa..179ca267cb4a49a463f7d6170f86e5c174941dfc 100644 --- a/require-ess/tools/driver.makefile +++ b/require-ess/tools/driver.makefile @@ -212,9 +212,6 @@ clean:: uninstall: $(RMDIR) ${MODULE_LOCATION} -ifneq ($(strip $(E3_MODULES_VENDOR_LIBS_LOCATION)),) - $(RMDIR) $(E3_MODULES_VENDOR_LIBS_LOCATION) -endif #uninstall.%: # $(RMDIR) $(wildcard ${MODULE_LOCATION}/R*${@:uninstall.%=%}*) @@ -452,9 +449,11 @@ debug:: # Loop over all architectures. install build debug:: + @+failed_builds=0; \ @+for ARCH in ${CROSS_COMPILER_TARGET_ARCHS}; do \ - umask 002; echo MAKING ARCH $$ARCH; ${MAKE} -f ${USERMAKEFILE} T_A=$$ARCH $@; \ - done + umask 002; echo MAKING ARCH $$ARCH; ${MAKE} -f ${USERMAKEFILE} T_A=$$ARCH $@ || ((failed_builds++)); \ + done; \ + @+((failed_builds == 0)) else # T_A