1. Georg Brandl
  2. sphinx


georg.brandl  committed 64abe20

* Define __file__ during conf.py execution.
* Make staticpath relative to conf.py dir.

  • Participants
  • Parent commits 45be326
  • Branches default

Comments (0)

Files changed (3)

File doc/conf.py

View file
 # All configuration values have a default value; values that are commented out
 # serve to show the default value.
-import sys
+import sys, os
 # If your extensions are in another directory, add it here.
 # General configuration
 # ---------------------

File sphinx/builder.py

View file
         self.info(bold('copying static files...'))
         ensuredir(path.join(self.outdir, 'static'))
         staticdirnames = [path.join(path.dirname(__file__), 'static')] + \
-                         self.config.html_static_path
+                         [path.join(self.srcdir, spath)
+                          for spath in self.config.html_static_path]
         for staticdirname in staticdirnames:
             for filename in os.listdir(staticdirname):
                 if not filename.startswith('.'):

File sphinx/config.py

View file
     def __init__(self, dirname, filename):
         self.values = self.config_values.copy()
-        config = {}
+        config = {'__file__': path.join(dirname, filename)}
         olddir = os.getcwd()
-            execfile(path.join(dirname, filename), config)
+            execfile(config['__file__'], config)
         # remove potentially pickling-problematic values