diff options
| author | Luke Bakken <luke@bakken.io> | 2020-08-04 08:41:45 -0700 |
|---|---|---|
| committer | Luke Bakken <luke@bakken.io> | 2020-08-04 08:41:45 -0700 |
| commit | a82711b192446c7894ff3d66ab09205d190c8214 (patch) | |
| tree | 2401a082984652e48b7c37d9e0ddaca9bc9f1985 | |
| parent | afe940d05bd3f5d8572a71e4c8ca547a60f320ea (diff) | |
| download | rabbitmq-server-git-a82711b192446c7894ff3d66ab09205d190c8214.tar.gz | |
Update rabbitmq-components.mk
| -rw-r--r-- | rabbitmq-components.mk | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index fbb77d6a60..091a35b7c0 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -317,26 +317,39 @@ prepare-dist:: # -------------------------------------------------------------------- # 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 ../../rabbitmq-components.mk),) -supposed_deps_dir = $(abspath ..) -else ifneq ($(wildcard ../../../../rabbitmq-components.mk),) -supposed_deps_dir = $(abspath ../../..) -else ifneq ($(wildcard UMBRELLA.md),) +# $(DEPS_DIR) for this project to point to the top-level's one. +# +# We also verify that the guessed DEPS_DIR is actually named `deps`, +# to rule out any situation where it is a coincidence that we found a +# `rabbitmq-components.mk` up upper directories. + +possible_deps_dir_1 = $(abspath ..) +possible_deps_dir_2 = $(abspath ../../..) + +ifeq ($(notdir $(possible_deps_dir_1)),deps) +ifneq ($(wildcard $(possible_deps_dir_1)/../rabbitmq-components.mk),) +deps_dir_overriden = 1 +DEPS_DIR ?= $(possible_deps_dir_1) DISABLE_DISTCLEAN = 1 endif +endif -# We also verify that the guessed DEPS_DIR is actually named `deps`, to rule -# out any situation where it is a coincidence that we found a -# `rabbitmq-components.mk` up upper directories. +ifeq ($(deps_dir_overriden),) +ifeq ($(notdir $(possible_deps_dir_2)),deps) +ifneq ($(wildcard $(possible_deps_dir_2)/../rabbitmq-components.mk),) +deps_dir_overriden = 1 +DEPS_DIR ?= $(possible_deps_dir_2) +DISABLE_DISTCLEAN = 1 +endif +endif +endif -ifeq ($(notdir $(supposed_deps_dir)),deps) +ifneq ($(wildcard UMBRELLA.md),) DISABLE_DISTCLEAN = 1 -DEPS_DIR ?= $(supposed_deps_dir) endif +# We disable `make distclean` so $(DEPS_DIR) is not accidentally removed. + ifeq ($(DISABLE_DISTCLEAN),1) ifneq ($(filter distclean distclean-deps,$(MAKECMDGOALS)),) SKIP_DEPS = 1 |