Revert "admin/build-doc: Use installed Sphinx and its dependencies, when possible."

This reverts commit c65ffe9f7f27bc0fe5afab36e9ef0de42bc3c74c.

oneiric, where the doc gitbuilder runs, doesn't have the
--system-site-packages option; let's get docs back and sort this out
offline.  (virtualenv 1.6.4-0ubuntu1 on oneiric, 1.7.1.2-1 on precise)

diff --git a/admin/build-doc b/admin/build-doc
index 0bcc799b0eb1f086b42bc48cd5c9b8007b4e3f18..81854640edf0a69ab40c322e9827c323f18e8284 100755 (executable)
--- a/admin/build-doc
+++ b/admin/build-doc
@@ -42,22 +42,12 @@ cd build-doc
 [ -z "$vdir" ] && vdir="./virtualenv"
 
 if [ ! -e $vdir ]; then
-    virtualenv --system-site-packages $vdir
-fi
-$vdir/bin/pip install -r ../admin/doc-requirements.txt
-
-sphinx_build="$vdir/bin/sphinx-build"
-if [ ! -e $sphinx_build ]; then
-    # If sphinx is not installed inside the virtualenv (that is, we
-    # have a system-wide sphinx installed and it is new enough), use
-    # that. As we need to use the python interpreter from inside the
-    # virtualenv to make the sphinx extensions visible, we need need
-    # to know the full path to the sphinx-build script.
-    sphinx_build="$(command -v -p sphinx-build)"
+    virtualenv --no-site-packages $vdir
 fi
+$vdir/bin/pip install --quiet -r ../admin/doc-requirements.txt
 
 install -d -m0755 \
     output/html \
     output/man
-PYTHONPATH="$(pwd)/../src/pybind" "$vdir/bin/python" "$sphinx_build" -a -b dirhtml -d doctrees ../doc output/html
-"$vdir/bin/python" "$sphinx_build" -a -b man -d doctrees ../doc output/man
+PYTHONPATH=`pwd`/../src/pybind $vdir/bin/sphinx-build -a -b dirhtml -d doctrees ../doc output/html
+$vdir/bin/sphinx-build -a -b man -d doctrees ../doc output/man