Skip to content

Commit

Permalink
Update erlang.mk
Browse files Browse the repository at this point in the history
  • Loading branch information
dumbbell committed Nov 19, 2015
1 parent 7da6509 commit a637e9e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions erlang.mk
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST)))

ERLANG_MK_VERSION = 1.2.0-849-g93261ea-dirty
ERLANG_MK_VERSION = 1.2.0-849-g29268fc-dirty

# Core configuration.

Expand Down Expand Up @@ -6417,7 +6417,7 @@ endif
$(verbose) for dep in $^ ; do \
if ! grep -qs ^$$dep$$ $(ERLANG_MK_TMP)/[email protected]; then \
echo $$dep >> $(ERLANG_MK_TMP)/[email protected]; \
if grep -qs -E "^[[:blank:]]*include[[:blank:]]+(|.*/)erlang\.mk$$" \
if grep -qs -E "^[[:blank:]]*include[[:blank:]]+(erlang\.mk|.*/erlang\.mk)$$" \
$$dep/GNUmakefile $$dep/makefile $$dep/Makefile; then \
$(MAKE) -C $$dep $@ IS_DEP=1 || exit $$?; \
fi \
Expand Down Expand Up @@ -6481,7 +6481,7 @@ ifndef IS_APP
done
endif
$(verbose) for dep in $(filter-out $(CURDIR),$(LIST_DIRS)); do \
if grep -qs -E "^[[:blank:]]*include[[:blank:]]+(|.*/)erlang\.mk$$" \
if grep -qs -E "^[[:blank:]]*include[[:blank:]]+(erlang\.mk|.*/erlang\.mk)$$" \
$$dep/GNUmakefile $$dep/makefile $$dep/Makefile; then \
$(MAKE) -C "$$dep" --no-print-directory $@ IS_DEP=1; \
fi; \
Expand Down

0 comments on commit a637e9e

Please sign in to comment.