Fix directory_containing_executable() in some cases (#2163).