diff options
| author | Tony Garnock-Jones <tonyg@lshift.net> | 2010-04-20 20:29:37 +1200 |
|---|---|---|
| committer | Tony Garnock-Jones <tonyg@lshift.net> | 2010-04-20 20:29:37 +1200 |
| commit | d4098eb629aebb2866f1f2299098d45b82be1e21 (patch) | |
| tree | fa287b818674a48ed551d4f09e5183d1e32ce70e | |
| parent | 39fdd3039cf23a323df9136f94c4266cc602922f (diff) | |
| parent | d9d6482b926653888933bdc4a2b9fca2981e79f2 (diff) | |
| download | rabbitmq-server-d4098eb629aebb2866f1f2299098d45b82be1e21.tar.gz | |
merge heads
| -rw-r--r-- | Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -5,6 +5,7 @@ RABBITMQ_NODENAME ?= rabbit RABBITMQ_SERVER_START_ARGS ?= RABBITMQ_MNESIA_DIR ?= $(TMPDIR)/rabbitmq-$(RABBITMQ_NODENAME)-mnesia RABBITMQ_LOG_BASE ?= $(TMPDIR) +RABBITMQ_CONFIG_FILE ?= $(CURDIR)/rabbitmq DEPS_FILE=deps.mk SOURCE_DIR=src @@ -130,6 +131,7 @@ run: all $(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \ RABBITMQ_ALLOW_INPUT=true \ RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS)" \ + RABBITMQ_CONFIG_FILE="$(RABBITMQ_CONFIG_FILE)" \ ./scripts/rabbitmq-server run-node: all @@ -137,6 +139,7 @@ run-node: all RABBITMQ_NODE_ONLY=true \ RABBITMQ_ALLOW_INPUT=true \ RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS)" \ + RABBITMQ_CONFIG_FILE="$(RABBITMQ_CONFIG_FILE)" \ ./scripts/rabbitmq-server run-tests: all @@ -146,6 +149,7 @@ start-background-node: $(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \ RABBITMQ_NODE_ONLY=true \ RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS) -detached" \ + RABBITMQ_CONFIG_FILE="$(RABBITMQ_CONFIG_FILE)" \ ./scripts/rabbitmq-server ; sleep 1 start-rabbit-on-node: all |