configure fails for 6.5 on Unixware 7

I'm using the April 15 snapshot of 6.5, on a SCO Unixware 7.0.1 system.

Running configure produces the message:

$ ./configure
loading cache ./config.cache
checking host system type... Invalid configuration
`i586-unixware-5-7.0.1': machine `i586-unixware-5' not recognized

*************************************************************
configure does not currently recognize your operating system,
therefore you must do a manual configuration of:

Please contact scrappy(at)hub(dot)org to see about rectifying this,
including the above 'checking host system type...' line
*************************************************************

The config.guess check for SCO UnixWare appears to be broken. It
outputs i586-unixware-5-7.0.1, which is not recognized by config.sub.

The attached patch changes config.guess back to the 6.4.2 behavior,
which worked just fine.

Andrew Merrill
The Computer Classroom, Inc.