PR#6599 continued: ocamlbuild, add -annot when using pack

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15533 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02