fixes for `make with-ocamlbuild` to work
Merge pull request #530 from avsm/fix-ocamlbuild

fixes for `make with-ocamlbuild` to work