From 8f51308dba0a5dc2f70c273e2de9fb7d102ed2f9 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 24 Sep 2018 14:50:01 +0200 Subject: Build: allow overriding DEPS_BUILD_DIR and DEPS_INSTALL_DIR for make deps. --- GNUmakefile | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index c0ed52d6035..21183220b80 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -45,12 +45,18 @@ endif # Dependencies DIR's DEPS_SOURCE_DIR:=$(BLENDER_DIR)/build_files/build_environment -DEPS_BUILD_DIR:=$(BUILD_DIR)/deps -DEPS_INSTALL_DIR:=$(shell dirname "$(BLENDER_DIR)")/lib/$(OS_NCASE) -ifneq ($(OS_NCASE),darwin) - # Add processor type to directory name - DEPS_INSTALL_DIR:=$(DEPS_INSTALL_DIR)_$(shell uname -p) +ifndef DEPS_BUILD_DIR + DEPS_BUILD_DIR:=$(BUILD_DIR)/deps +endif + +ifndef DEPS_INSTALL_DIR + DEPS_INSTALL_DIR:=$(shell dirname "$(BLENDER_DIR)")/lib/$(OS_NCASE) + + ifneq ($(OS_NCASE),darwin) + # Add processor type to directory name + DEPS_INSTALL_DIR:=$(DEPS_INSTALL_DIR)_$(shell uname -p) + endif endif # Allow to use alternative binary (pypy3, etc) -- cgit v1.2.3