From: Tobias Ulmer Date: Wed, 20 Nov 2013 17:59:33 +0000 (+0100) Subject: Don't hard-code make, but fetch the command from buildconfig X-Git-Tag: e2factory-2.3.15rc1~350 X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=6a2350a3d0e9e1ca916bdf7b13374c8e90d78237;p=e2factory.git Don't hard-code make, but fetch the command from buildconfig Signed-off-by: Tobias Ulmer --- diff --git a/Makefile b/Makefile index 48dfe95..b523e8f 100644 --- a/Makefile +++ b/Makefile @@ -51,6 +51,7 @@ buildconfig.lua: Makefile make.vars echo 'buildconfig.SYSCONFDIR="$(SYSCONFDIR)"' >>$@ echo 'buildconfig.E2="$(E2)"' >>$@ echo 'buildconfig.LUA="$(LUA)"' >>$@ + echo 'buildconfig.MAKE="$(MAKE)"' >> $@ echo 'buildconfig.MAJOR="$(MAJOR)"' >>$@ echo 'buildconfig.MINOR="$(MINOR)"' >>$@ echo 'buildconfig.PATCHLEVEL="$(PATCHLEVEL)"' >>$@ diff --git a/global/e2-install-e2.lua b/global/e2-install-e2.lua index e3d0e9d..51ae49c 100644 --- a/global/e2-install-e2.lua +++ b/global/e2-install-e2.lua @@ -219,7 +219,7 @@ local function e2_install_e2(arg) return false, e:cat(re) end local cmd = { - "make", + buildconfig.MAKE, "PREFIX="..buildconfig.PREFIX, "BINDIR="..buildconfig.BINDIR, "local",