put OS info back into the Makefile; sendmail discretionary info goes into