Commits

Georg Brandl committed 5dd3800

#338: Fix running with ``-C`` under Windows.

Comments (0)

Files changed (2)

 Release 0.6.5 (in development)
 ==============================
 
+* #338: Fix running with ``-C`` under Windows.
+
 * Make the ``start-after`` and ``end-before`` options to the
   ``literalinclude`` directive work correctly if not used together.
 

sphinx/application.py

         self.config = Config(confdir, CONFIG_FILENAME, confoverrides, self.tags)
         self.config.check_unicode(self.warn)
 
+        # set confdir to srcdir if -C given (!= no confdir); a few pieces
+        # of code expect a confdir to be set
+        if self.confdir is None:
+            self.confdir = self.srcdir
+
         # load all extension modules
         for extension in self.config.extensions:
             self.setup_extension(extension)