Fix "make 1" etc following the build system changes