diff options
| author | Philip Kuryloski <kuryloskip@vmware.com> | 2021-03-29 14:12:11 +0200 |
|---|---|---|
| committer | Philip Kuryloski <kuryloskip@vmware.com> | 2021-04-07 13:57:42 +0200 |
| commit | 950a2afb1db040d1c7dc9bb6645f6259591264fb (patch) | |
| tree | a4e291944b5352118a1c2720bacdf6a9326f5f0e | |
| parent | 51c4fb01d737121c2642b256ab0b40468a0aea3e (diff) | |
| download | rabbitmq-server-git-950a2afb1db040d1c7dc9bb6645f6259591264fb.tar.gz | |
Fix self-referencing recursive make variable
Introduced in 388654c5422409ccb7f26bf9e267d9aff4a52ba0
| -rw-r--r-- | deps/rabbit_common/mk/rabbitmq-run.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/deps/rabbit_common/mk/rabbitmq-run.mk b/deps/rabbit_common/mk/rabbitmq-run.mk index a1d109ad4a..1577dd99a4 100644 --- a/deps/rabbit_common/mk/rabbitmq-run.mk +++ b/deps/rabbit_common/mk/rabbitmq-run.mk @@ -102,9 +102,11 @@ else RMQ_PLUGINS_DIR=$(CURDIR)/$(DIST_DIR) endif -ifdef EXTRA_PLUGINS_DIR -RMQ_PLUGINS_DIR=$(RMQ_PLUGINS_DIR):$(EXTRA_PLUGINS_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))) define basic_script_env_settings MAKE="$(MAKE)" \ @@ -119,7 +121,7 @@ RABBITMQ_MNESIA_BASE="$(call node_mnesia_base,$(2))" \ RABBITMQ_MNESIA_DIR="$(call node_mnesia_dir,$(2))" \ RABBITMQ_QUORUM_DIR="$(call node_quorum_dir,$(2))" \ RABBITMQ_FEATURE_FLAGS_FILE="$(call node_feature_flags_file,$(2))" \ -RABBITMQ_PLUGINS_DIR="$(if $(RABBITMQ_PLUGINS_DIR),$(RABBITMQ_PLUGINS_DIR),$(RMQ_PLUGINS_DIR))" \ +RABBITMQ_PLUGINS_DIR="$(call node_plugins_dir)" \ RABBITMQ_PLUGINS_EXPAND_DIR="$(call node_plugins_expand_dir,$(2))" \ RABBITMQ_SERVER_START_ARGS="-ra wal_sync_method sync $(RABBITMQ_SERVER_START_ARGS)" \ RABBITMQ_ENABLED_PLUGINS="$(RABBITMQ_ENABLED_PLUGINS)" |