diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2019-12-12 13:14:51 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2019-12-12 13:14:51 +0100 |
| commit | 815d5fce0a378666534d5b04a6e9e07e52bfa1a8 (patch) | |
| tree | b633e60d81f4aa32f1a50ec9e7762c8fa89eed84 | |
| parent | ee47d69ecc5ce8d3a5552da39fb35b80eac586db (diff) | |
| download | rabbitmq-server-git-815d5fce0a378666534d5b04a6e9e07e52bfa1a8.tar.gz | |
Update rabbitmq-components.mk
| -rw-r--r-- | rabbitmq-components.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index fe092e8aa9..326a61a91f 100644 --- a/rabbitmq-components.mk +++ b/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 |