summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2009-04-16 10:58:04 +0100
committerMatthew Sackman <matthew@lshift.net>2009-04-16 10:58:04 +0100
commit71d2ec0691eacf99a274881aaf50d3ba93f0d80a (patch)
tree1ac588e3c26e0329905a2579940fb424c64b19e8 /Makefile
parentdd689096cfce851239646df70aaf1f22decd4d55 (diff)
parentdd07646f40a2ecdcd3637c08efb884dc563d580f (diff)
downloadrabbitmq-server-git-71d2ec0691eacf99a274881aaf50d3ba93f0d80a.tar.gz
merge bug20599 into v1_5
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index cb3f5999da..64e008c167 100644
--- a/Makefile
+++ b/Makefile
@@ -87,11 +87,10 @@ run-node: all
run-tests: all
echo "rabbit_tests:all_tests()." | $(ERL_CALL)
-start-background-node: stop-node
+start-background-node:
$(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \
RABBITMQ_NODE_ONLY=true \
- RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS) -detached" \
- ./scripts/rabbitmq-server ; sleep 1
+ ./scripts/rabbitmq-server -detached; sleep 1
start-rabbit-on-node: all
echo "rabbit:start()." | $(ERL_CALL)