Fix to build system.

Merge branch 'Create_Build_system' into CDAweb/head