Revert some Makefile changes

 * Fix template copy issue
 * Fix `dist` target