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

Merge branch 'bugfixes' into 'master'

Bugfixes

See merge request e3/e3-require!27
parents 019825ca 0e3bf82e
No related branches found
No related tags found
1 merge request!27Bugfixes
......@@ -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
......@@ -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
......
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