summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Kuryloski <kuryloskip@vmware.com>2021-03-29 16:59:53 +0200
committerPhilip Kuryloski <kuryloskip@vmware.com>2021-04-07 13:57:42 +0200
commit26b7e8759ee6dd2f571614762fa8ed32fed2f9be (patch)
tree578ab41bf43790dbbd67f5a5b8143ad36f13f29f
parenta15f9225ed2143023cd38b0c48b95f44029e79ab (diff)
downloadrabbitmq-server-git-26b7e8759ee6dd2f571614762fa8ed32fed2f9be.tar.gz
Remove extra spaces in the RABBITMQ_PLUGINS_DIR during tests
-rw-r--r--deps/rabbit_common/mk/rabbitmq-run.mk6
1 files changed, 1 insertions, 5 deletions
diff --git a/deps/rabbit_common/mk/rabbitmq-run.mk b/deps/rabbit_common/mk/rabbitmq-run.mk
index 1577dd99a4..220aaf33d9 100644
--- a/deps/rabbit_common/mk/rabbitmq-run.mk
+++ b/deps/rabbit_common/mk/rabbitmq-run.mk
@@ -102,11 +102,7 @@ else
RMQ_PLUGINS_DIR=$(CURDIR)/$(DIST_DIR)
endif
-node_plugins_dir = $(if $(RABBITMQ_PLUGINS_DIR),\
- $(RABBITMQ_PLUGINS_DIR),\
- $(if $(EXTRA_PLUGINS_DIR),\
- $(EXTRA_PLUGINS_DIR):$(RMQ_PLUGINS_DIR),\
- $(RMQ_PLUGINS_DIR)))
+node_plugins_dir = $(if $(RABBITMQ_PLUGINS_DIR),$(RABBITMQ_PLUGINS_DIR),$(if $(EXTRA_PLUGINS_DIR),$(EXTRA_PLUGINS_DIR):$(RMQ_PLUGINS_DIR),$(RMQ_PLUGINS_DIR)))
define basic_script_env_settings
MAKE="$(MAKE)" \