summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2010-04-23 11:38:54 +0100
committerMatthew Sackman <matthew@lshift.net>2010-04-23 11:38:54 +0100
commitcbcba28522967b63e974e3105ce8592e83406ea6 (patch)
tree3af411c761b7f0ac9875f046187313dc902cffa9
parentd9d6482b926653888933bdc4a2b9fca2981e79f2 (diff)
downloadrabbitmq-server-cbcba28522967b63e974e3105ce8592e83406ea6.tar.gz
Backed out changeset 1db0ab47b6d5 as the change will create silent failure for configurable plugin users who have not moved from the default config location.
-rw-r--r--Makefile4
1 files changed, 0 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 5dbf612d..6cb086ab 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,6 @@ 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
@@ -131,7 +130,6 @@ 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
@@ -139,7 +137,6 @@ 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
@@ -149,7 +146,6 @@ 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