fix makefil template
Merge branch 'master' into feature-cygwin-proc