diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rwxr-xr-x | scripts/rabbitmq-env | 5 |
2 files changed, 6 insertions, 4 deletions
@@ -19,7 +19,10 @@ USAGES_ERL = $(foreach XML, $(USAGES_XML), $(call usage_xml_to_erl, $(XML))) EXTRA_SOURCES += $(USAGES_ERL) .DEFAULT_GOAL = all -$(PROJECT).d:: $(EXTRA_SOURCES) gen_escripts +$(PROJECT).d:: $(EXTRA_SOURCES) + +rel:: + $(MAKE) gen_escripts gen_escripts: cp -r ${DEPS_DIR}/rabbitmq_cli/escript ./ diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 8349f10fbf..f1962e2b7b 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -245,9 +245,8 @@ rmq_check_if_shared_with_mnesia \ ## Development-specific environment. if [ "${RABBITMQ_DEV_ENV}" ]; then - if [ "$(basename "$0")" = 'rabbitmq-plugins' -a \( \ - "$RABBITMQ_PLUGINS_DIR_source" != 'environment' -o \ - "$RABBITMQ_ENABLED_PLUGINS_FILE_source" != 'environment' \) ]; then + if [ "$RABBITMQ_PLUGINS_DIR_source" != 'environment' -o \ + "$RABBITMQ_ENABLED_PLUGINS_FILE_source" != 'environment' ]; then # We need to query the running node for the plugins directory # and the "enabled plugins" file. eval $( (${RABBITMQ_SCRIPTS_DIR}/rabbitmqctl eval \ |