summaryrefslogtreecommitdiff
path: root/sphinx/application.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-02-23 21:35:48 +0100
committerGeorg Brandl <georg@python.org>2010-02-23 21:35:48 +0100
commitfc6b3c57f34f45559867477caea874e36c53297d (patch)
tree5dec6dce49ca8ff747238c44600d1fcd12a36698 /sphinx/application.py
parent6f9ecec63a9f018b87bfdc7830d6aa21acf0708c (diff)
downloadsphinx-fc6b3c57f34f45559867477caea874e36c53297d.tar.gz
#338: Fix running with ``-C`` under Windows.
Diffstat (limited to 'sphinx/application.py')
-rw-r--r--sphinx/application.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/sphinx/application.py b/sphinx/application.py
index 7d5c5439..3817009f 100644
--- a/sphinx/application.py
+++ b/sphinx/application.py
@@ -94,6 +94,11 @@ class Sphinx(object):
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)