Add cp back to Makefile and fix build.
Merge pull request #174 from ebfe/fix-cp

Add cp back to Makefile and fix build.