diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-09-01 18:30:45 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2015-10-20 11:10:48 +0200 |
| commit | 93d830ee5a3f94477de2c8c4a216d71ad729dad0 (patch) | |
| tree | 4d2080df8244465422000f262ff0f7e53ae60469 /scripts | |
| parent | 2a2e302557c45a857acc909dd55e9775c288d5a1 (diff) | |
| download | rabbitmq-server-git-93d830ee5a3f94477de2c8c4a216d71ad729dad0.tar.gz | |
rabbitmq-env: Use deps/rabbit_common in ERL_LIBS
... if there is no dist.
Also, export ERL_LIBS.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-env | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 7450450953..40b2fa9277 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -241,11 +241,14 @@ if [ -f "${RABBITMQ_HOME}/erlang.mk" ]; then # directory, they need the location of rabbit_common. if [ -d "${RABBITMQ_HOME}/dist" ]; then ERL_LIBS="${RABBITMQ_HOME}/dist:${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}" fi ERL_LIBS=${ERL_LIBS%:} + export ERL_LIBS fi RABBITMQ_ENV_LOADED=1 |