From 30ac929bf7a79963c8aa5e2bfef62dc932f90186 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Fri, 23 Nov 2018 17:40:57 +0100 Subject: Ensure apps have APPS_DIR and DEPS_DIR defined So they can use include files and other from other apps when they're built directly, and that they use the same deps directory. --- plugins/bootstrap.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/bootstrap.mk b/plugins/bootstrap.mk index 88d71b2..17b32b8 100644 --- a/plugins/bootstrap.mk +++ b/plugins/bootstrap.mk @@ -75,7 +75,12 @@ PROJECT = $p PROJECT_DESCRIPTION = New project PROJECT_VERSION = 0.1.0 -include $(call core_relpath,$(dir $(ERLANG_MK_FILENAME)),$(APPS_DIR)/app)/erlang.mk +# Make sure we know where the applications are located. +ROOT_DIR := $(call core_relpath,$(dir $(ERLANG_MK_FILENAME)),$(APPS_DIR)/app) +APPS_DIR := .. +DEPS_DIR := $(call core_relpath,$(DEPS_DIR),$(APPS_DIR)/app) + +include $$(ROOT_DIR)/erlang.mk endef define bs_app -- cgit v1.2.3