summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2017-01-31 11:25:08 +0100
committerJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2017-01-31 11:25:08 +0100
commit051967f1f9e9fb273dadff98e072b6ce5d828578 (patch)
treec11a41789f40f7124fd1f7ed9901594b0c0730eb /Makefile
parent192f844d6fe0259aa0d6bb0f0eeb283a9038f031 (diff)
parent0b95bbfc9ee995e8132bd9abc9c4b89e4b673a87 (diff)
downloadrabbitmq-server-git-051967f1f9e9fb273dadff98e072b6ce5d828578.tar.gz
Merge branch 'stable'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5eee081181..f953eaf46f 100644
--- a/Makefile
+++ b/Makefile
@@ -144,8 +144,8 @@ copy-escripts:
DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
- rabbit_common/mk/rabbitmq-run.mk \
rabbit_common/mk/rabbitmq-dist.mk \
+ rabbit_common/mk/rabbitmq-run.mk \
rabbit_common/mk/rabbitmq-tools.mk
# FIXME: Use erlang.mk patched for RabbitMQ, while waiting for PRs to be