summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2015-10-28 19:03:39 +0100
committerJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2015-10-28 19:03:39 +0100
commitb81e0af1b0392f961bb97ca0f51e8e1065b9d6df (patch)
treec57fca3848eda6d2dedaa7b3ed0e984cfaf3656f
parent7132caff0f6e6b9a48a3a53e14afcf07c5d0d8cb (diff)
downloadrabbitmq-server-git-b81e0af1b0392f961bb97ca0f51e8e1065b9d6df.tar.gz
make source-dist: Use $(PROJECT) instead of hardcoding `rabbit`
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 27e13bd2af..d999b54c6b 100644
--- a/Makefile
+++ b/Makefile
@@ -217,7 +217,7 @@ $(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/licensing
- $(verbose) for dep in $$(cat $(ERLANG_MK_RECURSIVE_DEPS_LIST) | grep -v '/rabbit$$' | LC_COLLATE=C sort); do \
+ $(verbose) for dep in $$(cat $(ERLANG_MK_RECURSIVE_DEPS_LIST) | grep -v '/$(PROJECT)$$' | LC_COLLATE=C sort); do \
$(RSYNC) $(RSYNC_FLAGS) \
$$dep \
$(SOURCE_DIST)/deps; \
@@ -238,7 +238,7 @@ $(SOURCE_DIST): $(ERLANG_MK_RECURSIVE_DEPS_LIST)
sed -E -i.bak -e 's/[{]vsn[[:blank:]]*,[[:blank:]]*""[[:blank:]]*}/{vsn, "$(VERSION)"}/' $$file; \
rm $$file.bak; \
done
- $(verbose) echo "rabbit $$(git rev-parse HEAD) $$(git describe --tags --exact-match 2>/dev/null || git symbolic-ref -q --short HEAD)" > $(SOURCE_DIST)/git-revisions.txt
+ $(verbose) echo "$(PROJECT) $$(git rev-parse HEAD) $$(git describe --tags --exact-match 2>/dev/null || git symbolic-ref -q --short HEAD)" > $(SOURCE_DIST)/git-revisions.txt
$(verbose) for dep in $$(cat $(ERLANG_MK_RECURSIVE_DEPS_LIST)); do \
(cd $$dep; echo "$$(basename "$$dep") $$(git rev-parse HEAD) $$(git describe --tags --exact-match 2>/dev/null || git symbolic-ref -q --short HEAD)") >> $(SOURCE_DIST)/git-revisions.txt; \
done