Makefile: also set PATH from dependencies

1 files changed, 6 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 3defb78..b2f9331 100644
--- a/Makefile
+++ b/Makefile
@@ -135,9 +135,13 @@ package_generic =$(filter-out $(patsubst rules/%/Makefile,%,$(wildcard rules/*/M
 
 dirs2jars = $(if $1,$(shell $(FIND) $1 -name '*.jar'))
 deps2jars = $(filter %.jar,$1) $(call dirs2jars,$(filter build/packages/%,$1))
-deps2classpath = $(shell $(ECHO) $(abspath $(call deps2jars,$1)) | $(SED) 'y/ /:/')
+deps2classpath = $(shell $(ECHO) $(abspath $(call deps2jars,$1)) $(CLASSPATH) | $(SED) 'y/ /:/')
 
-recurse = CLASSPATH='$(call deps2classpath,$^)' extra_makefiles='$(abspath $(wildcard rules/$*/*.mk))' $(MAKE) -C build/workdir/$* -f '$1' install DESTDIR='$(top)/$@'
+deps2bindirs = $(if $1,$(sort $(shell $(FIND) $1 -type f -executable -printf '%h\n' 2>/dev/null)))
+sanitize_bindirs = $(filter-out $(subst :, ,$(PATH)),$(abspath $1))
+deps2path = $(shell $(ECHO) $(call sanitize_bindirs,$(call deps2bindirs,$1)) $(PATH) | $(SED) 'y/ /:/')
+
+recurse = PATH='$(call deps2path,$^)' CLASSPATH='$(call deps2classpath,$^)' extra_makefiles='$(abspath $(wildcard rules/$*/*.mk))' $(MAKE) -C build/workdir/$* -f '$1' install DESTDIR='$(top)/$@'
 
 $(addprefix build/packages/,$(package_specific)): \
 build/packages/%: RECURSIVE build/workdir/% rules/%/Makefile