diff options
| author | Loïc Hoguin <[email protected]> | 2015-12-24 16:04:22 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2015-12-24 16:04:22 +0100 |
| commit | e41632002d35049e37e318c649cf8439938c3f0d (patch) | |
| tree | 66c44f0bbf52ad35d8bf992cdec9e141798131f9 /plugins/bootstrap.mk | |
| parent | 1624b70fe633229ce71e70dd3a7be5dcb8c47583 (diff) | |
| download | erlang.mk-e41632002d35049e37e318c649cf8439938c3f0d.tar.gz erlang.mk-e41632002d35049e37e318c649cf8439938c3f0d.tar.bz2 erlang.mk-e41632002d35049e37e318c649cf8439938c3f0d.zip | |
Work around an auto completion bug with ZSH
At the same time update the Makefile templates which were
missing PROJECT_DESCRIPTION and PROJECT_VERSION fields.
Diffstat (limited to 'plugins/bootstrap.mk')
| -rw-r--r-- | plugins/bootstrap.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/plugins/bootstrap.mk b/plugins/bootstrap.mk index 464d8fe..4aa1052 100644 --- a/plugins/bootstrap.mk +++ b/plugins/bootstrap.mk @@ -49,6 +49,8 @@ define bs_appsrc_lib ]}. endef +# To prevent autocompletion issues with ZSH, we add "include erlang.mk" +# separately during the actual bootstrap. ifdef SP define bs_Makefile PROJECT = $p @@ -58,17 +60,21 @@ PROJECT_VERSION = 0.0.1 # Whitespace to be used when creating files from templates. SP = $(SP) -include erlang.mk endef else define bs_Makefile PROJECT = $p -include erlang.mk +PROJECT_DESCRIPTION = New project +PROJECT_VERSION = 0.0.1 + endef endif define bs_apps_Makefile PROJECT = $p +PROJECT_DESCRIPTION = New project +PROJECT_VERSION = 0.0.1 + include $(call core_relpath,$(dir $(ERLANG_MK_FILENAME)),$(APPS_DIR)/app)/erlang.mk endef @@ -362,6 +368,7 @@ endif $(eval p := $(PROJECT)) $(eval n := $(PROJECT)_sup) $(call render_template,bs_Makefile,Makefile) + $(verbose) echo "include erlang.mk" >> Makefile $(verbose) mkdir src/ ifdef LEGACY $(call render_template,bs_appsrc,src/$(PROJECT).app.src) @@ -375,6 +382,7 @@ ifneq ($(wildcard src/),) endif $(eval p := $(PROJECT)) $(call render_template,bs_Makefile,Makefile) + $(verbose) echo "include erlang.mk" >> Makefile $(verbose) mkdir src/ ifdef LEGACY $(call render_template,bs_appsrc_lib,src/$(PROJECT).app.src) |