Added missing test for 'check' function.
Moved Makefile to an include.
Added new Makefile that includes the old one.
Updated make include file.
Added back the system version info.
Fixed up vars in make include.