Updated the build system to use the same command line scheme as the main repository.