From f2cd401b7dc23b66fff5ff3a6d95ddb44338de02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Sat, 20 Jun 2015 23:50:30 +0200 Subject: Fix 'make' and 'gmake' calls in rebar hooks $(MAKE) works everywhere, including space. --- core/deps.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/deps.mk b/core/deps.mk index 09ceb7b..e1fd8c7 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -281,10 +281,10 @@ define dep_autopatch_rebar.erl Write("\npre-app::\n"), PatchHook = fun(Cmd) -> case Cmd of - "make -C" ++ _ -> Escape(Cmd); - "gmake -C" ++ _ -> Escape(Cmd); - "make " ++ Cmd1 -> "make -f Makefile.orig.mk " ++ Escape(Cmd1); - "gmake " ++ Cmd1 -> "gmake -f Makefile.orig.mk " ++ Escape(Cmd1); + "make -C" ++ Cmd1 -> "$$$$\(MAKE) -C" ++ Escape(Cmd1); + "gmake -C" ++ Cmd1 -> "$$$$\(MAKE) -C" ++ Escape(Cmd1); + "make " ++ Cmd1 -> "$$$$\(MAKE) -f Makefile.orig.mk " ++ Escape(Cmd1); + "gmake " ++ Cmd1 -> "$$$$\(MAKE) -f Makefile.orig.mk " ++ Escape(Cmd1); _ -> Escape(Cmd) end end, -- cgit v1.2.3