Small Makefile fixes
Merge pull request #1426 from OCamlPro/mf-fixes

Small Makefile fixes