diff options
| author | Luke Bakken <lbakken@pivotal.io> | 2020-07-29 10:02:02 -0700 |
|---|---|---|
| committer | Luke Bakken <lbakken@pivotal.io> | 2020-07-29 10:02:02 -0700 |
| commit | 0ec913c642451f1fb60636369a4df64cbe6e0755 (patch) | |
| tree | 0ec1bd844c1f71299a5db38748fcf5d0eb36d737 | |
| parent | 9b90d4b0ba3c13e57554c9d033c19f3d7fbb5c2d (diff) | |
| download | rabbitmq-server-git-0ec913c642451f1fb60636369a4df64cbe6e0755.tar.gz | |
Update rabbitmq-components.mk
| -rw-r--r-- | deps/rabbitmq_ct_client_helpers/rabbitmq-components.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/deps/rabbitmq_ct_client_helpers/rabbitmq-components.mk b/deps/rabbitmq_ct_client_helpers/rabbitmq-components.mk index 6767aad57d..71f65c0522 100644 --- a/deps/rabbitmq_ct_client_helpers/rabbitmq-components.mk +++ b/deps/rabbitmq_ct_client_helpers/rabbitmq-components.mk @@ -316,21 +316,21 @@ prepare-dist:: # Umbrella-specific settings. # -------------------------------------------------------------------- -# If this project is under the Umbrella project, we override $(DEPS_DIR) -# to point to the Umbrella's one. We also disable `make distclean` so -# $(DEPS_DIR) is not accidentally removed. +# If the top-level project is a RabbitMQ component, we override +# $(DEPS_DIR) for this project to point to the top-level's one. We also +# disable `make distclean` so $(DEPS_DIR) is not accidentally removed. -ifneq ($(wildcard ../../UMBRELLA.md),) -UNDER_UMBRELLA = 1 +ifneq ($(wildcard ../../rabbitmq-components.mk),) +DISABLE_DISTCLEAN = 1 DEPS_DIR ?= $(abspath ..) -else ifneq ($(wildcard ../../../../UMBRELLA.md),) -UNDER_UMBRELLA = 1 +else ifneq ($(wildcard ../../../../rabbitmq-components.mk),) +DISABLE_DISTCLEAN = 1 DEPS_DIR ?= $(abspath ../../..) else ifneq ($(wildcard UMBRELLA.md),) -UNDER_UMBRELLA = 1 +DISABLE_DISTCLEAN = 1 endif -ifeq ($(UNDER_UMBRELLA),1) +ifeq ($(DISABLE_DISTCLEAN),1) ifneq ($(filter distclean distclean-deps,$(MAKECMDGOALS)),) SKIP_DEPS = 1 endif |