From 6eaf07deb49f3a9adb6e2efcba44a8bfce3fd87c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Mon, 26 Nov 2018 13:22:17 +0100
Subject: Fix propagation of SP in sub-apps

And some refactor and additional testing for overriding.

Turns out we can override some variables even if ?= is not used,
so nothing had to be done to support overriding.
---
 plugins/bootstrap.mk | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'plugins/bootstrap.mk')

diff --git a/plugins/bootstrap.mk b/plugins/bootstrap.mk
index 84f168e..52ff72f 100644
--- a/plugins/bootstrap.mk
+++ b/plugins/bootstrap.mk
@@ -51,30 +51,24 @@ endef
 
 # To prevent autocompletion issues with ZSH, we add "include erlang.mk"
 # separately during the actual bootstrap.
-ifdef SP
 define bs_Makefile
 PROJECT = $p
 PROJECT_DESCRIPTION = New project
 PROJECT_VERSION = 0.1.0
-
+$(if $(SP),
 # Whitespace to be used when creating files from templates.
 SP = $(SP)
-
-endef
-else
-define bs_Makefile
-PROJECT = $p
-PROJECT_DESCRIPTION = New project
-PROJECT_VERSION = 0.1.0
-
+)
 endef
-endif
 
 define bs_apps_Makefile
 PROJECT = $p
 PROJECT_DESCRIPTION = New project
 PROJECT_VERSION = 0.1.0
-
+$(if $(SP),
+# Whitespace to be used when creating files from templates.
+SP = $(SP)
+)
 # Make sure we know where the applications are located.
 ROOT_DIR ?= $(call core_relpath,$(dir $(ERLANG_MK_FILENAME)),$(APPS_DIR)/app)
 APPS_DIR ?= ..
-- 
cgit v1.2.3