From 3f8688e0d0526b74993d64a166e9ba8559c687e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Mon, 15 May 2017 14:37:40 +0200 Subject: Make autopatch of Erlang.mk projects less obtrusive We do not touch the erlang.mk file anymore. We only patch the Makefile to include the top-level Erlang.mk by changing the 'include erlang.mk' line to look for ERLANG_MK_FILENAME if it is defined. The modified Makefile can be committed safely. --- doc/src/guide/deps.asciidoc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'doc/src/guide/deps.asciidoc') diff --git a/doc/src/guide/deps.asciidoc b/doc/src/guide/deps.asciidoc index 7b36c91..82e3e89 100644 --- a/doc/src/guide/deps.asciidoc +++ b/doc/src/guide/deps.asciidoc @@ -487,10 +487,11 @@ on the kind of project it finds the dependency to be. as their build tool. This essentially patches Rebar out, and fixes and converts the project to be compatible with Erlang.mk. -* Erlang.mk projects have their 'erlang.mk' file redirect to -the top-level project's Erlang.mk. This is to ensure that -functionality works across all dependencies, even if the -dependency's Erlang.mk is outdated. +* Erlang.mk projects have their 'Makefile' patched, if necessary, +to include the top-level project's Erlang.mk. This is to ensure +that functionality works across all dependencies, even if the +dependency's Erlang.mk is outdated. The patched Makefile +can be safely committed if necessary. * Other Erlang projects get a small Erlang.mk Makefile generated automatically. -- cgit v1.2.3