summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorArnaud Cogoluègnes <acogoluegnes@gmail.com>2017-01-31 17:14:18 +0100
committerArnaud Cogoluègnes <acogoluegnes@gmail.com>2017-01-31 17:14:18 +0100
commite06ad9811621e4f44ebedc6893968924745b4d85 (patch)
treeff22d190b53675aab14fdf1ba0da4f1afc187c78 /Makefile
parent41394d3cc9f2aa28f213dd75ebf2d64a9a7d37a6 (diff)
parent22a756fd8c10f317590a43754548df3192cf3701 (diff)
downloadrabbitmq-server-git-e06ad9811621e4f44ebedc6893968924745b4d85.tar.gz
Merge branch 'master' into rabbitmq-server-1085
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