More Makefile.unix tweaks