Merge pull request #1467 from OCamlPro/self-upgrade-opam

Add a self-upgrade package description
Fix Makefile