davemds pushed a commit to branch master. commit 3ca0ccd040228165a9d67c6047f4cda54ab6982d Author: davemds <d...@gurumeditation.it> Date: Sun Sep 15 15:16:44 2013 +0200
PythonEFL: make a little more readable the include directory for sphinx. Also some tweaks to the INSTALL file. --- INSTALL | 8 ++++---- doc/conf.py | 7 ++++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/INSTALL b/INSTALL index ce5b226..094c9fd 100644 --- a/INSTALL +++ b/INSTALL @@ -31,15 +31,15 @@ * BUILDING WITH GCC/G++ (Linux, OS X, etc.) - python setup.py build_ext + python setup.py build * BUILDING WITH Visual Studio (Windows) - python setup.py build_ext + python setup.py build * BUILDING WITH MINGW (Windows) - python setup.py build_ext -c mingw32 + python setup.py build -c mingw32 @@ -70,7 +70,7 @@ To build the docs for the bindings you need to have Sphinx installed, for (optional) graphs you need Graphviz, for (optional) Youtube demonstration videos you need the YouTube module from sphinx contrib repository. - packages: python-sphinx, graphviz + packages: python-sphinx, graphviz, python-pygraphviz, libgv-python To build the docs just run: python setup.py build_doc diff --git a/doc/conf.py b/doc/conf.py index 74e2649..fa711fc 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -17,7 +17,12 @@ import sys, os, platform # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. -d = "lib." + "-".join((platform.system().lower(), platform.machine(), unicode(sys.version_info[0])+"."+unicode(sys.version_info[1]))) +d = "lib.%s-%s-%d.%d" % ( + platform.system().lower(), + platform.machine(), + sys.version_info[0], + sys.version_info[1] + ) sys.path.insert(0, os.path.abspath("../build/"+d)) #sys.path.insert(0, os.path.abspath('../build/lib.linux-i686-3.2')) --