summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2017-02-01 15:42:25 +0300
committerMichael Klishin <mklishin@pivotal.io>2017-02-01 15:42:25 +0300
commitf4f8c58e72f39c2181e8293bff8f9d995a88b1a3 (patch)
tree90a3f0455534e0dda35ae19deb4685909e936578 /Makefile
parent40cdcf956c602666b476061e5d1621ccbdf342c3 (diff)
parent22a756fd8c10f317590a43754548df3192cf3701 (diff)
downloadrabbitmq-server-git-f4f8c58e72f39c2181e8293bff8f9d995a88b1a3.tar.gz
merge branch 'master'
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