The binary directory can now be specified when building from source, and Sphinx
now takes its version into account when checking if it is already installed.
Merge branch 'bindir'

* bindir:
  The binary directory can now be specified when building from source, and Sphinx now takes its version into account when checking if it is already installed.