diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2015-12-09 08:04:29 -0800 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2015-12-09 08:04:29 -0800 |
| commit | 99c68002bfd87e5ee1a08dee0c777832f39f95af (patch) | |
| tree | bed97fff8666cc204ea6698ad664a16c3c92fa10 /Makefile | |
| parent | 81834de912bce65f5a3cd9a77b9e137a8cef0570 (diff) | |
| parent | 497ad281afc4af593e5bfacf53100e3da6cb1c76 (diff) | |
| download | rabbitmq-server-git-99c68002bfd87e5ee1a08dee0c777832f39f95af.tar.gz | |
Merge branch 'master' into rabbitmq-server-479
Diffstat (limited to 'Makefile')
| -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; \ |