Index: config/fish/functions/make.fish
==================================================================
--- config/fish/functions/make.fish
+++ config/fish/functions/make.fish
@@ -1,11 +1,15 @@
-# Automatically use bmake instead of make when using pkgsrc
+# Automatically use bmake instead of make when using pkgsrc, if necessary
 function make
-	if which bmake >/dev/null ^&1 && \
-	    string match -q -r '/pkgsrc$|/pkgsrc/' $PWD
+	if string match -q -r '/pkgsrc$|/pkgsrc/' $PWD
 		# pkgsrc does not like MAKEFLAGS including -j
 		set -lx MAKEFLAGS
-		command bmake $argv
+
+		if which bmake >/dev/null ^&1 && \
+			command bmake $argv
+		else
+			command make $argv
+		end
 	else
 		command make $argv
 	end
 end