Use erlang.mk
Merge branch 'dev'