diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2015-11-02 10:39:41 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2015-11-02 10:39:41 +0300 |
| commit | 0368d6bc50ae6cf7e513439ddf2c46f46df254d6 (patch) | |
| tree | 3cb92d11084472c431ce99171bc76c3ac4c6ae86 /rabbitmq-components.mk | |
| parent | 03c28ed96e16d05b12d8019969eb3ac8854b242b (diff) | |
| parent | 412cb9c8197e778182418519a8a1d445319d90a4 (diff) | |
| download | rabbitmq-server-git-0368d6bc50ae6cf7e513439ddf2c46f46df254d6.tar.gz | |
Merge branch 'master' into rabbitmq-server-379
Diffstat (limited to 'rabbitmq-components.mk')
| -rw-r--r-- | rabbitmq-components.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index a5ab0ace11..5b0fe27564 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -82,9 +82,7 @@ RABBITMQ_COMPONENTS = amqp_client \ rabbitmq_tracing \ rabbitmq_web_dispatch \ rabbitmq_web_stomp \ - rabbitmq_web_stomp_examples \ - sockjs \ - toke + rabbitmq_web_stomp_examples ifeq ($(origin current_rmq_ref),undefined) ifneq ($(wildcard .git),) @@ -156,8 +154,16 @@ else RABBITMQ_SCRIPTS_DIR ?= $(DEPS_DIR)/rabbit/scripts endif -RABBITMQCTL ?= $(RABBITMQ_SCRIPTS_DIR)/rabbitmqctl +ifeq ($(shell uname -o),Msys) +RABBITMQ_PLUGINS ?= $(RABBITMQ_SCRIPTS_DIR)/rabbitmq-plugins.bat +RABBITMQ_SERVER ?= $(RABBITMQ_SCRIPTS_DIR)/rabbitmq-server.bat +RABBITMQCTL ?= $(RABBITMQ_SCRIPTS_DIR)/rabbitmqctl.bat +else RABBITMQ_PLUGINS ?= $(RABBITMQ_SCRIPTS_DIR)/rabbitmq-plugins +RABBITMQ_SERVER ?= $(RABBITMQ_SCRIPTS_DIR)/rabbitmq-server +RABBITMQCTL ?= $(RABBITMQ_SCRIPTS_DIR)/rabbitmqctl +endif + export RABBITMQ_SCRIPTS_DIR RABBITMQCTL RABBITMQ_PLUGINS # -------------------------------------------------------------------- |