diff options
| author | Loïc Hoguin <[email protected]> | 2019-05-27 13:23:03 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2019-05-27 13:23:03 +0200 |
| commit | f50fb91fabc11ae62ed1d4920a350ebf6858dbfd (patch) | |
| tree | f63a4ef9af6ab6abaab01fedc1c621519d425ad0 | |
| parent | fb87e18fbe47261c43d2674308bd2258dab1225d (diff) | |
| download | erlang.mk-f50fb91fabc11ae62ed1d4920a350ebf6858dbfd.tar.gz erlang.mk-f50fb91fabc11ae62ed1d4920a350ebf6858dbfd.tar.bz2 erlang.mk-f50fb91fabc11ae62ed1d4920a350ebf6858dbfd.zip | |
Do git describe on the right folder for {vsn,git}
| -rw-r--r-- | core/deps.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/deps.mk b/core/deps.mk index c81323a..33177ed 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -580,7 +580,7 @@ define dep_autopatch_appsrc.erl {ok, [{application, $(1), L0}]} = file:consult(AppSrcIn), L1 = lists:keystore(modules, 1, L0, {modules, []}), L2 = case lists:keyfind(vsn, 1, L1) of - {_, git} -> lists:keyreplace(vsn, 1, L1, {vsn, lists:droplast(os:cmd("git describe --dirty --tags --always"))}); + {_, git} -> lists:keyreplace(vsn, 1, L1, {vsn, lists:droplast(os:cmd("git -C $(DEPS_DIR)/$1 describe --dirty --tags --always"))}); {_, {cmd, _}} -> lists:keyreplace(vsn, 1, L1, {vsn, "cmd"}); _ -> L1 end, |