drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 5 Pull Requests Actions Releases 7 Activity

Merge commit 'feb7e4c18450cf6f0b428ffbc1892fd805aa2a7e'

Browse Source
This commit is contained in:
Gary Talent 2017-07-01 02:31:26 -05:00
commit b63b9ffef2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/ox/Makefile vendored
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)