diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2015-11-19 16:42:17 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2015-11-19 16:42:17 +0300 |
| commit | ed42f6c4d1d028b8055868f5a2543264e5a3b0b3 (patch) | |
| tree | 1c9c184f29d70798fa6dec8c938658ab2cc64ab4 | |
| parent | 2e6d27cf4e6e8eceb4cd8004a31bd625084fc50a (diff) | |
| parent | 7c9f0454700d4748ff53e4e1097d0aa600d997aa (diff) | |
| download | rabbitmq-server-git-ed42f6c4d1d028b8055868f5a2543264e5a3b0b3.tar.gz | |
Merge branch 'master' into rabbitmq-server-260
| -rw-r--r-- | erlang.mk | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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. @@ -6501,7 +6501,7 @@ endif $(verbose) for dep in $^ ; do \ if ! grep -qs ^$$dep$$ $(ERLANG_MK_TMP)/$@.log; then \ echo $$dep >> $(ERLANG_MK_TMP)/$@.log; \ - 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 \ @@ -6565,7 +6565,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; \ |