diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-10-27 10:08:36 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-10-27 10:08:36 +0100 |
| commit | dc7740cd8987665449a8e765a8dd05c31c367566 (patch) | |
| tree | b0a219f789c2208d90c72219c37c1cb274796a07 /Makefile | |
| parent | e52ac8764f82d1375f85ddbd458a0c7c86ff4757 (diff) | |
| download | rabbitmq-server-git-dc7740cd8987665449a8e765a8dd05c31c367566.tar.gz | |
make source-dist: Fix licenses handling to match previous behavior
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -217,8 +217,8 @@ ZIP_V = $(ZIP_V_$(V)) $(SOURCE_DIST): $(ERLANG_MK_RECURSIVE_DEPS_LIST) $(gen_verbose) $(RSYNC) $(RSYNC_FLAGS) ./ $(SOURCE_DIST)/ $(verbose) cat packaging/common/LICENSE.head > $(SOURCE_DIST)/LICENSE - $(verbose) mkdir -p $(SOURCE_DIST)/deps - $(verbose) for dep in $$(cat $(ERLANG_MK_RECURSIVE_DEPS_LIST) | grep -v '/rabbit$$'); do \ + $(verbose) mkdir -p $(SOURCE_DIST)/deps/licensing + $(verbose) for dep in $$(cat $(ERLANG_MK_RECURSIVE_DEPS_LIST) | grep -v '/rabbit$$' | LC_COLLATE=C sort); do \ $(RSYNC) $(RSYNC_FLAGS) \ $$dep \ $(SOURCE_DIST)/deps; \ @@ -228,10 +228,13 @@ $(SOURCE_DIST): $(ERLANG_MK_RECURSIVE_DEPS_LIST) rm $(SOURCE_DIST)/deps/$$(basename $$dep)/erlang.mk.bak; \ fi; \ if test -f "$$dep/license_info"; then \ + cp -a "$$dep/license_info" "$(SOURCE_DIST)/deps/licensing/license_info_$$(basename "$$dep")"; \ cat "$$dep/license_info" >> $(SOURCE_DIST)/LICENSE; \ fi; \ + find "$$dep" -maxdepth 1 -name 'LICENSE-*' -exec cp '{}' $(SOURCE_DIST)/deps/licensing \; ; \ done $(verbose) cat packaging/common/LICENSE.tail >> $(SOURCE_DIST)/LICENSE + $(verbose) find $(SOURCE_DIST)/deps/licensing -name 'LICENSE-*' -exec cp '{}' $(SOURCE_DIST) \; $(verbose) for file in $$(find $(SOURCE_DIST) -name '*.app.src'); do \ sed -E -i.bak -e 's/[{]vsn[[:blank:]]*,[^}]+}/{vsn, "$(VERSION)"}/' $$file; \ rm $$file.bak; \ |