Add -s flag to nested make calls

This commit is contained in:
2017-05-19 21:04:43 -05:00
parent 68c144fe75
commit 4798e545c9
+2 -2
View File
@@ -3,9 +3,9 @@ HOST_ENV=${OS}-$(shell uname -m)
DEVENV=devenv$(shell pwd | sed 's/\//-/g') DEVENV=devenv$(shell pwd | sed 's/\//-/g')
DEVENV_IMAGE=wombatant/devenv DEVENV_IMAGE=wombatant/devenv
ifneq ($(shell which gmake),) ifneq ($(shell which gmake),)
MAKE=gmake MAKE=gmake -s
else else
MAKE=make MAKE=make -s
endif endif
ifneq ($(shell which docker 2>&1),) ifneq ($(shell which docker 2>&1),)
ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running) ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running)