Revert "Fix some small bugs in the makefile template."

This reverts commit 9ab035e8a8a93321463641762df39ec3463b3110.