Modifying jenkins scripts to use new Makefile, again