Jan Lindemann
68d740764a
The following variables contain colons as path-separators:
- JW_PKG_PYTHON_PATH - JW_PKG_EXE_PATH - JW_PKG_LD_LIBRARY_PATH
This commit makes them use spaces instead, so they can be more easily amended by Makefiles using them. Also define them in a more uniform way, and use the newly introduced PREREQ_RUN variable to fill them, which in turn can also be appended to before that.
Signed-off-by: Jan Lindemann <jan@janware.com>
20 lines
901 B
Makefile
20 lines
901 B
Makefile
# == System environment variables
|
|
|
|
# -- LD_LIBRARY_PATH
|
|
LD_LIBRARY_PATH_ENV = $(shell echo $(FINAL_LDFLAGS) | $(SED) 's/^-[^L] *[^ ]*/ /g; s/[ ]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g')
|
|
ifeq ($(origin JW_PKG_LD_LIBRARY_PATH),undefined)
|
|
JW_PKG_LD_LIBRARY_PATH := $(call proj_query, ldlibpath --delimiter ' ' $(PROJECT) $(PREREQ_RUN))
|
|
endif
|
|
export LD_LIBRARY_PATH := $(subst $(space),:,$(JW_PKG_LD_LIBRARY_PATH)):$(LD_LIBRARY_PATH_ENV)
|
|
ifeq ($(TARGET),mingw)
|
|
DLL_PATH = $(subst :,;,$(LD_LIBRARY_PATH));$(CROSS_TOOL_DIR)/bin
|
|
endif
|
|
|
|
# -- PATH
|
|
EXE_SEARCH_PATH_ENV := $(PATH)
|
|
ifeq ($(origin JW_PKG_EXE_PATH),undefined)
|
|
JW_PKG_EXE_PATH := $(call proj_query, exepath --delimiter ' ' $(PROJECT) $(PREREQ_RUN))
|
|
endif
|
|
export PATH := $(subst $(space),:,$(JW_PKG_EXE_PATH)):$(EXE_SEARCH_PATH_ENV)
|
|
|
|
include $(JWBDIR)/make/py-path.mk
|