diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-11-20 13:19:03 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-11-20 13:19:03 +0100 |
| commit | f6b36919ba08d0038e78ac03eb873f85b40527fe (patch) | |
| tree | bdd834b11117fea4f62eae733613ff23c286df08 | |
| parent | b44626cae3be4635b0147d8a8f8101d5a77497fe (diff) | |
| download | rabbitmq-server-git-f6b36919ba08d0038e78ac03eb873f85b40527fe.tar.gz | |
Makefile: Fix how we modify an autopatched erlang.mk
This fixes package builds when eg. ranch was pulled from a
sub-repository instead of from the Umbrella.
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -235,10 +235,10 @@ $(SOURCE_DIST): $(ERLANG_MK_RECURSIVE_DEPS_LIST) $(RSYNC) $(RSYNC_FLAGS) \ $$dep \ $@/deps; \ - if test -f $@/deps/$$(basename $$dep)/erlang.mk; then \ - sed -E -i.bak -e 's,^include[[:blank:]]+$(abspath erlang.mk),include ../../erlang.mk,' \ - $@/deps/$$(basename $$dep)/erlang.mk; \ - rm $@/deps/$$(basename $$dep)/erlang.mk.bak; \ + if test -f $@/deps/$$(basename $$dep)/erlang.mk && \ + test "$$(wc -l $@/deps/$$(basename $$dep)/erlang.mk | awk '{print $$1;}')" = "1" && \ + grep -qs -E "^[[:blank:]]*include[[:blank:]]+(erlang\.mk|.*/erlang\.mk)$$" $@/deps/$$(basename $$dep)/erlang.mk; then \ + echo "include ../../erlang.mk" > $@/deps/$$(basename $$dep)/erlang.mk; \ fi; \ if test -f "$$dep/license_info"; then \ cp "$$dep/license_info" "$@/deps/licensing/license_info_$$(basename "$$dep")"; \ |