aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2015-06-15 17:38:29 +0200
committerLoïc Hoguin <[email protected]>2015-06-15 17:38:29 +0200
commitdb34337a24e9c1dec4377296bb8941d40a960b8e (patch)
tree9229ad6632771efa3036cfda7720060924a99aaf
parent761be708a519dc7a3d6f9ebda7bcfb8b085b2b8d (diff)
downloaderlang.mk-db34337a24e9c1dec4377296bb8941d40a960b8e.tar.gz
erlang.mk-db34337a24e9c1dec4377296bb8941d40a960b8e.tar.bz2
erlang.mk-db34337a24e9c1dec4377296bb8941d40a960b8e.zip
Fix details in .app template
Was using $(MODULES) instead of $(2).
-rw-r--r--core/erlc.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/erlc.mk b/core/erlc.mk
index 035b375..b1f7c40 100644
--- a/core/erlc.mk
+++ b/core/erlc.mk
@@ -51,7 +51,7 @@ define app_file
{description, "$(PROJECT_DESCRIPTION)"},
{vsn, "$(PROJECT_VERSION)"},
{id, "$(1)"},
- {modules, [$(MODULES)]},
+ {modules, [$(2)]},
{registered, []},
{applications, $(call erlang_list,kernel stdlib $(OTP_DEPS) $(DEPS))}
]}.
@@ -62,7 +62,7 @@ define app_file
{description, "$(PROJECT_DESCRIPTION)"},
{vsn, "$(PROJECT_VERSION)"},
{id, "$(1)"},
- {modules, [$(MODULES)]},
+ {modules, [$(2)]},
{registered, $(call erlang_list,$(PROJECT)_sup $(PROJECT_REGISTERED))},
{applications, $(call erlang_list,kernel stdlib $(OTP_DEPS) $(DEPS))},
{mod, {$(PROJECT)_app, []}}
@@ -71,9 +71,9 @@ endef
endif
app-build: erlc-include ebin/$(PROJECT).app
+ $(eval GITDESCRIBE := $(shell git describe --dirty --abbrev=7 --tags --always --first-parent 2>/dev/null || true))
$(eval MODULES := $(shell find ebin -type f -name \*.beam \
| sed "s/ebin\//'/;s/\.beam/',/" | sed '$$s/.$$//'))
- $(eval GITDESCRIBE := $(shell git describe --dirty --abbrev=7 --tags --always --first-parent 2>/dev/null || true))
ifeq ($(wildcard src/$(PROJECT).app.src),)
$(app_verbose) echo $(subst $(newline),,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES)))) \
> ebin/$(PROJECT).app