Windows and solaris fixes

Solaris doesn't support multi-line grep. More fixes for install on
windows.