proj.mk: Allow MODDIR to be overridden from the environment

Make the MODDIR definition in proj.mk depend on the environment:
- Change "=" assignment to "?="
- Prepend $(BUILD_TOOLS_PREFIX) to /opt/jw-build

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-06-19 13:18:54 +02:00
commit e6e64d09fd

View file

@ -5,6 +5,6 @@ PROJECTS_DIR ?= $(TOPDIR)/..
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
FLAVOUR_PATH_PREFIX = win32/ FLAVOUR_PATH_PREFIX = win32/
endif endif
MODDIR = $(firstword $(wildcard $(PROJECTS_DIR)/jw-build /opt/$(FLAVOUR_PATH_PREFIX)jw-build)) MODDIR ?= $(firstword $(wildcard $(PROJECTS_DIR)/jw-build $(BUILD_TOOLS_PREFIX)/opt/$(FLAVOUR_PATH_PREFIX)jw-build))
USE_PROJECT_LIB = false USE_PROJECT_LIB = false