Makefile: clean up deps2{class,}path

1 files changed, 2 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index b98e3a1..6584fe0 100644
--- a/Makefile
+++ b/Makefile
@@ -211,15 +211,12 @@ $(foreach line,\
 
 package: PHONY $(addprefix build/packages/,$(packages))
 
-_sanitize_deps = $(filter-out build/workdir/%,$1)
-
 _dirs2jars = $(if $1,$(shell $(FIND) $1 -name '*.jar'))
 _deps2jars = $(filter %.jar,$1) $(call _dirs2jars,$(filter build/packages/%,$1))
-deps2classpath = $(shell $(ECHO) $(abspath $(call _deps2jars,$(call _sanitize_deps,$1))) $(CLASSPATH) | $(SED) 'y/ /:/')
+deps2classpath = $(shell $(ECHO) $(abspath $(call _deps2jars,$1)) $(CLASSPATH) | $(SED) 'y/ /:/')
 
 _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,$(call _sanitize_deps,$1))) $(PATH) | $(SED) 'y/ /:/')
+deps2path = $(shell $(ECHO) $(abspath $(call _deps2bindirs,$(filter build/packages/%,$1))) $(PATH) | $(SED) 'y/ /:/')
 
 recurse = \
 	PATH='$(call deps2path,$^)' \