summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDavid Wragg <david@rabbitmq.com>2010-08-18 14:52:40 +0100
committerDavid Wragg <david@rabbitmq.com>2010-08-18 14:52:40 +0100
commit640a4efe6901b82f074704cad5f08fd7f332f20a (patch)
tree5d781dd5975a0c9a860bf5c9af7000d9704041d8 /Makefile
parent29a4762324299261b0764aa1e83f6401419fa50d (diff)
downloadrabbitmq-server-git-640a4efe6901b82f074704cad5f08fd7f332f20a.tar.gz
Eliminate RABBITMQ_PLUGINS_EXPAND_DIR
There were a number of issues with RABBITMQ_PLUGINS_EXPAND_DIR: - It was undocumented in the context of the generic unix package, and if unwisely set could do an effective "rm -rf" in an unintended location. - It did not take account of the possibility that multiple nodes could be starting at once, and so doing plugins activation simultanteously. Instead, use RABBITMQ_MNESIA_DIR/plugins-scratch. This avoids the need to extend the generic unix package documentation, the location is node-specific, and the distinctive plugins-scratch subdirectory reduces the risk of unintended file deletions. (transplanted from 064b8797493bb290156fb72a54f9e9276df0faed)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index e060c804b4..b6f4b7e5a9 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_PLUGINS_EXPAND_DIR ?= $(TMPDIR)/rabbitmq-$(RABBITMQ_NODENAME)-plugins-scratch
DEPS_FILE=deps.mk
SOURCE_DIR=src
@@ -147,8 +146,7 @@ BASIC_SCRIPT_ENVIRONMENT_SETTINGS=\
RABBITMQ_NODE_IP_ADDRESS="$(RABBITMQ_NODE_IP_ADDRESS)" \
RABBITMQ_NODE_PORT="$(RABBITMQ_NODE_PORT)" \
RABBITMQ_LOG_BASE="$(RABBITMQ_LOG_BASE)" \
- RABBITMQ_MNESIA_DIR="$(RABBITMQ_MNESIA_DIR)" \
- RABBITMQ_PLUGINS_EXPAND_DIR="$(RABBITMQ_PLUGINS_EXPAND_DIR)"
+ RABBITMQ_MNESIA_DIR="$(RABBITMQ_MNESIA_DIR)"
run: all
$(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \