From c789d8a6aa7f9185b2e5d35fa80b36214ac477b1 Mon Sep 17 00:00:00 2001
From: marco <marco@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Mon, 14 Jun 2010 08:18:34 +0000
Subject: [PATCH] Provide a proper fix for a problem r2384 tried to work around
Look first for sphinx-build, then for sphinx-build-2.6. As part
of this change, it is now required to run make.py with ost as
we make use of the settings.Locate() function
git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2390 5a81b35b-ba03-0410-adc8-b2c5c5119f08
---
doc/make.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/doc/make.py b/doc/make.py
index 028e781d8..bdc035dd8 100644
--- a/doc/make.py
+++ b/doc/make.py
@@ -1,5 +1,6 @@
import os, sys, re
import shutil
+from ost import settings
if len(sys.argv)==2:
root_dir=sys.argv[1]
else:
@@ -61,5 +62,6 @@ def _CollectRstDocs(outdir, dirname, fnames):
for sub_dir in ('modules',):
os.path.walk(sub_dir, _CollectRstDocs, 'doc/source')
-os.system('sphinx-build-2.6 -b html -c %s %s %s' % ('doc/conf', 'doc/source',
- 'doc/build'))
+sphinx_bin=settings.Locate(['sphinx-build', 'sphinx-build-2.6'])
+os.system('%s -b html -c %s %s %s' % (sphinx_bin, 'doc/conf', 'doc/source',
+ 'doc/build'))
--
GitLab