diff --git a/make/ldlibpath.mk b/make/ldlibpath.mk
index f2590509..b0373d74 100644
--- a/make/ldlibpath.mk
+++ b/make/ldlibpath.mk
@@ -3,18 +3,18 @@
 # -- 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 $(PROJECT) $(PREREQ_BUILD))
+  JW_PKG_LD_LIBRARY_PATH    := $(call proj_query, ldlibpath --delimiter ' ' $(PROJECT) $(PREREQ_RUN))
 endif
-export LD_LIBRARY_PATH      := $(JW_PKG_LD_LIBRARY_PATH)
+export LD_LIBRARY_PATH      := $(subst $(space),:,$(JW_PKG_LD_LIBRARY_PATH)):$(LD_LIBRARY_PATH_ENV)
 ifeq ($(TARGET),mingw)
-  DLL_PATH                   = $(shell echo $(LD_LIBRARY_PATH) | $(SED) 's/:/;/g');$(CROSS_TOOL_DIR)/bin
+  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 $(PROJECT) $(PREREQ_BUILD)):$(EXE_SEARCH_PATH_ENV)
+  JW_PKG_EXE_PATH           := $(call proj_query, exepath --delimiter ' ' $(PROJECT) $(PREREQ_RUN))
 endif
-export PATH                 := $(JW_PKG_EXE_PATH)
+export PATH                 := $(subst $(space),:,$(JW_PKG_EXE_PATH)):$(EXE_SEARCH_PATH_ENV)
 
 include $(JWBDIR)/make/py-path.mk
diff --git a/make/py-path.mk b/make/py-path.mk
index 0b5b2115..39c72737 100644
--- a/make/py-path.mk
+++ b/make/py-path.mk
@@ -1,6 +1,7 @@
 # -- PYTHONPATH
 PYTHONPATH_ENV              := $(PYTHONPATH)
+JW_PKG_PYTHON_PATH_PREREQ   += $(PROJECT)
 ifeq ($(origin JW_PKG_PYTHON_PATH),undefined)
-  JW_PKG_PYTHON_PATH        := $(call proj_query, pythonpath $(PROJECT))
+  JW_PKG_PYTHON_PATH        := $(shell $(JW_PKG_PY) --topdir-format absolute projects pythonpath --delimiter ' ' $(PROJECT) $(PREREQ_RUN))
 endif
-export PYTHONPATH           := $(JW_PKG_PYTHON_PATH)
+export PYTHONPATH           := $(subst $(space),:,$(JW_PKG_PYTHON_PATH))