diff options
| author | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2015-10-12 19:02:03 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2015-10-20 11:10:48 +0200 |
| commit | 8692d245f959c95c5683c96991fc654bd71481ae (patch) | |
| tree | f58bf78c5100c51baec72f593321cdf1ac3f7f96 | |
| parent | 51fd10caac23abcf89fe781bef685392d2809b2d (diff) | |
| download | rabbitmq-server-git-8692d245f959c95c5683c96991fc654bd71481ae.tar.gz | |
Update rabbitmq-components.mk
| -rw-r--r-- | rabbitmq-components.mk | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index baf06c9519..82c3358154 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -71,24 +71,28 @@ deps:: check-rabbitmq-components.mk list-deps: check-rabbitmq-components.mk endif -# If this project is under the Umbrella project, we override $(DEPS_DIR) to point -# to the Umbrella's one. +# 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. -ifneq ($(PROJECT),rabbitmq_public_umbrella) ifneq ($(wildcard ../../UMBRELLA.md),) -DEPS_DIR ?= $(abspath ..) UNDER_UMBRELLA = 1 -$(info === DEPS_DIR = $(DEPS_DIR)) -endif +else ifneq ($(wildcard UMBRELLA.md),) +UNDER_UMBRELLA = 1 endif -# When under the Umbrella, we must prevent `make distclean` from -# removing $(DEPS_DIR). - ifeq ($(UNDER_UMBRELLA),1) +ifneq ($(PROJECT),rabbitmq_public_umbrella) +DEPS_DIR ?= $(abspath ..) + +distclean:: distclean-components + @: + +distclean-components: +endif + ifneq ($(filter distclean distclean-deps,$(MAKECMDGOALS)),) SKIP_DEPS = 1 -$(info === Disable make distclean) endif endif |