From 33d436266e263bab240fa23bf6786dbc11afe23e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Thu, 12 Dec 2019 13:14:52 +0100 Subject: [PATCH] Update rabbitmq-components.mk --- deps/rabbitmq_cli/rabbitmq-components.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deps/rabbitmq_cli/rabbitmq-components.mk b/deps/rabbitmq_cli/rabbitmq-components.mk index fe092e8aa9..326a61a91f 100644 --- a/deps/rabbitmq_cli/rabbitmq-components.mk +++ b/deps/rabbitmq_cli/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