From 0aa0d6ffbe9bf02c3179b7cb2b978d1896655e05 Mon Sep 17 00:00:00 2001 From: Tom Jones Date: Thu, 18 Jan 2024 10:48:17 +0000 Subject: build: Explicitly use gmake VPP requires GNU Make to build, on GNU systems (such as Debian), GNU Make is installed as 'make', typically with a symlink from 'gmake'. On other systems (such as FreeBSD), 'make' is a BSD Make derriviative and GNU Make is installed a 'gmake'. Use $(MAKE) variable for make calls from within Makefiles. This variable is set to the path of the calling make program, i.e., /usr/local/bin/gmake on a bsd system. This is the recommended way to call make from Makefiles in the GNU Make documentation. Type: improvement Change-Id: Id9162a34a0f8358f22090718087918dae31c0fce Signed-off-by: Tom Jones --- build/external/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'build/external') diff --git a/build/external/Makefile b/build/external/Makefile index a445d7b21ee..af2512c4614 100644 --- a/build/external/Makefile +++ b/build/external/Makefile @@ -15,7 +15,6 @@ SHELL := $(shell which bash) DL_CACHE_DIR = $(HOME)/Downloads -MAKE ?= make MAKE_ARGS ?= -j BUILD_DIR ?= $(CURDIR)/_build INSTALL_DIR ?= $(CURDIR)/_install @@ -159,17 +158,17 @@ ifeq ($(INSTALLED_VER)$(INSTALLED_RPM_VER),) @echo "development package by invoking 'make install-ext-deps'" @echo "from the top level directory" @echo "==========================================================" - make config + $(MAKE) config else ifneq ($(INSTALLED_VER),) make check-deb endif ifneq ($(INSTALLED_RPM_VER),) - make check-rpm + $(MAKE) check-rpm endif endif ebuild-install: ifeq ($(INSTALLED_VER)$(INSTALLED_RPM_VER),) - make install + $(MAKE) install endif -- cgit 1.2.3-korg