ChangeLog:
* doc/baseconf.py: Inject dirname(__file__)/'modules' to path
instead of just ``.''.
* doc/gcc_sphinx.py: Moved to...
* doc/modules/gcc_sphinx.py: ...here.
---
Evening,
This patch addresses a path mixup and provides a nice compromise between
convenience for the user and namespace cleanliness. Further modules
that Sphinx imports internally from the GCC tree should also go into
this directory. I moved gcc_sphinx since I knew of that one, but there
could be others I'm missing.
Tested on x86_64-pc-linux-gnu with ``make html''.
Have a great night!
doc/baseconf.py | 4 +++-
doc/{ => modules}/gcc_sphinx.py | 0
2 files changed, 3 insertions(+), 1 deletion(-)
rename doc/{ => modules}/gcc_sphinx.py (100%)
diff --git a/doc/baseconf.py b/doc/baseconf.py
index 47e3a126416..d85659e4540 100644
--- a/doc/baseconf.py
+++ b/doc/baseconf.py
@@ -13,7 +13,6 @@
import os
import time
import sys
-# sys.path.insert(0, os.path.abspath('.'))
# gccint needs a deeper stack limit
sys.setrecursionlimit(2000)
@@ -23,8 +22,11 @@ sys.setrecursionlimit(2000)
# The full version, including alpha/beta/rc tags
folder = os.path.dirname(os.path.realpath(__file__))
+doc_modules = os.path.join(folder, 'modules')
gcc_srcdir = os.path.join(folder, '..', 'gcc')
+sys.path.insert(0, doc_modules)
+
def read_file(name):
path = os.path.join(gcc_srcdir, name)
if os.path.exists(path):
diff --git a/doc/gcc_sphinx.py b/doc/modules/gcc_sphinx.py
similarity index 100%
rename from doc/gcc_sphinx.py
rename to doc/modules/gcc_sphinx.py
--
2.38.1
