diff options
| author | Loïc Hoguin <[email protected]> | 2018-11-26 13:22:17 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2018-11-26 13:22:17 +0100 |
| commit | 6eaf07deb49f3a9adb6e2efcba44a8bfce3fd87c (patch) | |
| tree | da8336a91765bd5963a97332d93547fc5f204a1a /plugins/bootstrap.mk | |
| parent | 5498bec3a1e3868258803382a92d31b4bc8014fa (diff) | |
| download | erlang.mk-6eaf07deb49f3a9adb6e2efcba44a8bfce3fd87c.tar.gz erlang.mk-6eaf07deb49f3a9adb6e2efcba44a8bfce3fd87c.tar.bz2 erlang.mk-6eaf07deb49f3a9adb6e2efcba44a8bfce3fd87c.zip | |
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.
Diffstat (limited to 'plugins/bootstrap.mk')
| -rw-r--r-- | plugins/bootstrap.mk | 18 |
1 files changed, 6 insertions, 12 deletions
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 ?= .. |