Fix up last change to makefile to actually do the right thing...