diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-05-03 01:32:35 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-03 01:32:35 +0900 |
| commit | 0ea06e40ca98dbf812b0c0161d418f94c16a5d0e (patch) | |
| tree | b9a5be262157d2fdd5edf52bbeb2526f4173ed12 /sphinx/setup_command.py | |
| parent | 622119a9d4e1294ce9718e490983edf58b50e6ac (diff) | |
| parent | f1221cc9fd13bf67fbc17b7f73afa9f7cdf622b3 (diff) | |
| download | sphinx-git-0ea06e40ca98dbf812b0c0161d418f94c16a5d0e.tar.gz | |
Merge branch 'master' into 789_escape_braces_on_samp_role
Diffstat (limited to 'sphinx/setup_command.py')
| -rw-r--r-- | sphinx/setup_command.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sphinx/setup_command.py b/sphinx/setup_command.py index 37fc2d042..eebc70def 100644 --- a/sphinx/setup_command.py +++ b/sphinx/setup_command.py @@ -179,7 +179,8 @@ class BuildDoc(Command): app = None try: - with patch_docutils(), docutils_namespace(): + confdir = self.config_dir or self.source_dir + with patch_docutils(confdir), docutils_namespace(): app = Sphinx(self.source_dir, self.config_dir, builder_target_dir, self.doctree_dir, builder, confoverrides, status_stream, |