diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-09-25 10:23:37 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2015-10-20 11:10:48 +0200 |
| commit | 7b838f0d1569cf87c222312ed2095bc025927145 (patch) | |
| tree | aec7ad85e73fb13b3b22b16ce517141383972464 /scripts | |
| parent | 9cb1b4ec05de3df01d4b620bbf573284ea544acd (diff) | |
| download | rabbitmq-server-git-7b838f0d1569cf87c222312ed2095bc025927145.tar.gz | |
Use `plugins` as the dist directory directly
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-env | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 40b2fa9277..167f63356f 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -239,13 +239,13 @@ rmq_check_if_shared_with_mnesia \ if [ -f "${RABBITMQ_HOME}/erlang.mk" ]; then # When RabbitMQ or the rabbitmq* scripts are started from the source # directory, they need the location of rabbit_common. - if [ -d "${RABBITMQ_HOME}/dist" ]; then - ERL_LIBS="${RABBITMQ_HOME}/dist:${ERL_LIBS}" + if [ -d "${RABBITMQ_PLUGINS_DIR}" ]; then + ERL_LIBS="${RABBITMQ_PLUGINS_DIR}:${ERL_LIBS}" elif [ -d "${RABBITMQ_HOME}/deps/rabbit_common/ebin" ]; then ERL_LIBS="${RABBITMQ_HOME}/deps:${ERL_LIBS}" fi if [ "${DEPS_DIR}" -a -d "$(dirname "${DEPS_DIR}")" ]; then - ERL_LIBS="$(dirname ${DEPS_DIR})/dist:${ERL_LIBS}" + ERL_LIBS="$(dirname ${DEPS_DIR})/plugins:${ERL_LIBS}" fi ERL_LIBS=${ERL_LIBS%:} export ERL_LIBS |