Fix again: NFC/NFD normalizing problem. Closes #1142

1 files changed, 5 insertions, 2 deletions

diff --git a/sphinx/setup_command.py b/sphinx/setup_command.py
index 70358bbbc..07cd520c3 100644
--- a/sphinx/setup_command.py
+++ b/sphinx/setup_command.py
@@ -19,6 +19,7 @@ from distutils.cmd import Command
 
 from sphinx.application import Sphinx
 from sphinx.util.console import darkred, nocolor, color_terminal
+from sphinx.util.osutil import abspath
 
 
 class BuildDoc(Command):
@@ -104,14 +105,16 @@ class BuildDoc(Command):
         self.ensure_dirname('source_dir')
         if self.source_dir is None:
             self.source_dir = os.curdir
-        self.source_dir = os.path.abspath(self.source_dir)
+        self.source_dir = abspath(self.source_dir)
         if self.config_dir is None:
             self.config_dir = self.source_dir
+        self.config_dir = abspath(self.config_dir)
 
         if self.build_dir is None:
             build = self.get_finalized_command('build')
-            self.build_dir = os.path.join(build.build_base, 'sphinx')
+            self.build_dir = os.path.join(abspath(build.build_base), 'sphinx')
             self.mkpath(self.build_dir)
+        self.build_dir = abspath(self.build_dir)
         self.doctree_dir = os.path.join(self.build_dir, 'doctrees')
         self.mkpath(self.doctree_dir)
         self.builder_target_dir = os.path.join(self.build_dir, self.builder)