Merge pull request #2239 from xen0l/gmake