aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhii Kostiushkin <[email protected]>2018-04-07 00:56:03 +0300
committerLoïc Hoguin <[email protected]>2018-04-25 18:40:06 +0200
commite0a3ca730974caf6bf6e7c7debadcc42d5548d29 (patch)
treeec0d1b7e978617a15ca130401c22215b11980d5b
parent22b77abb905cd12af7e1b3d5f1d6f8f927da18df (diff)
downloaderlang.mk-e0a3ca730974caf6bf6e7c7debadcc42d5548d29.tar.gz
erlang.mk-e0a3ca730974caf6bf6e7c7debadcc42d5548d29.tar.bz2
erlang.mk-e0a3ca730974caf6bf6e7c7debadcc42d5548d29.zip
Fix rebar pre_hooks patch
-rw-r--r--core/deps.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/deps.mk b/core/deps.mk
index f694708..45c20cd 100644
--- a/core/deps.mk
+++ b/core/deps.mk
@@ -332,7 +332,8 @@ define dep_autopatch_rebar.erl
Write("\npre-deps::\n"),
Write("\npre-app::\n"),
PatchHook = fun(Cmd) ->
- case Cmd of
+ Cmd2 = re:replace(Cmd, "^([g]?make)(.*)( -C.*)", "\\\\1\\\\3\\\\2", [{return, list}]),
+ case Cmd2 of
"make -C" ++ Cmd1 -> "$$\(MAKE) -C" ++ Escape(Cmd1);
"gmake -C" ++ Cmd1 -> "$$\(MAKE) -C" ++ Escape(Cmd1);
"make " ++ Cmd1 -> "$$\(MAKE) -f Makefile.orig.mk " ++ Escape(Cmd1);