Merge pull request #1914 from sairon/fossil-fix-makefile