diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-12-07 16:06:51 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-12-07 16:06:51 +0100 |
| commit | bbbd8f345ff3bf8912b9249087c9c20648c42309 (patch) | |
| tree | 48f6619d213f1463b561d3d5ab6ba301f43a61c3 | |
| parent | 3c2136053a7f704b15cb2b252384488b638a75b4 (diff) | |
| download | rabbitmq-server-git-bbbd8f345ff3bf8912b9249087c9c20648c42309.tar.gz | |
make source-dist: Fix path to erlang.mk in rebar-based dependencies
When rebar is used to build a dependency, a Makefile including erlang.mk
is automatically generated. This Makefile finds erlang.mk in the project
which depends on this rebar-based component.
For instance, mochiweb could find erlang.mk in
rabbitmq_auth_backend_http. This breaks the build from a source
distribution if a project is not distributed (ie.
rabbitmq_auth_backend_http in this example).
| -rw-r--r-- | Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -262,6 +262,9 @@ $(SOURCE_DIST): $(ERLANG_MK_RECURSIVE_DEPS_LIST) 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; \ + sed -E -i.bak "s|^[[:blank:]]*include[[:blank:]]+\.\./.*erlang.mk$$|include ../../erlang.mk|" \ + $@/deps/$$(basename $$dep)/Makefile && \ + rm $@/deps/$$(basename $$dep)/Makefile.bak; \ if test -f "$$dep/license_info"; then \ cp "$$dep/license_info" "$@/deps/licensing/license_info_$$(basename "$$dep")"; \ cat "$$dep/license_info" >> $@/LICENSE; \ |