Updating the makefile to reflect CMake; addendum to r193989.