diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2019-12-12 13:14:55 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2019-12-12 13:14:55 +0100 |
| commit | 4c9d0417c42c826cf787d8f66214754e41436a2a (patch) | |
| tree | 62aa43de15fbde9154c6c7484a4ce50638ab8d5c /deps/rabbitmq_management_agent | |
| parent | 2786ffa4314099260d95885275d8ad1773ee7a10 (diff) | |
| download | rabbitmq-server-git-4c9d0417c42c826cf787d8f66214754e41436a2a.tar.gz | |
Update rabbitmq-components.mk
Diffstat (limited to 'deps/rabbitmq_management_agent')
| -rw-r--r-- | deps/rabbitmq_management_agent/rabbitmq-components.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/deps/rabbitmq_management_agent/rabbitmq-components.mk b/deps/rabbitmq_management_agent/rabbitmq-components.mk index fe092e8aa9..326a61a91f 100644 --- a/deps/rabbitmq_management_agent/rabbitmq-components.mk +++ b/deps/rabbitmq_management_agent/rabbitmq-components.mk @@ -322,15 +322,15 @@ prepare-dist:: ifneq ($(wildcard ../../UMBRELLA.md),) UNDER_UMBRELLA = 1 +DEPS_DIR ?= $(abspath ..) +else ifneq ($(wildcard ../../../../UMBRELLA.md),) +UNDER_UMBRELLA = 1 +DEPS_DIR ?= $(abspath ../../..) else ifneq ($(wildcard UMBRELLA.md),) UNDER_UMBRELLA = 1 endif ifeq ($(UNDER_UMBRELLA),1) -ifneq ($(PROJECT),rabbitmq_public_umbrella) -DEPS_DIR ?= $(abspath ..) -endif - ifneq ($(filter distclean distclean-deps,$(MAKECMDGOALS)),) SKIP_DEPS = 1 endif |