@@ -2,14 +2,14 @@
 function make
 	if string match -q -r '/pkgsrc$|/pkgsrc/' $PWD
 		# pkgsrc does not like MAKEFLAGS including -j
 		set -lx MAKEFLAGS
 
-		if which bmake >/dev/null ^&1 && \
+		if type -q bmake
 			command bmake $argv
 		else
 			command make $argv
 		end
 	else
 		command make $argv
 	end
 end