Merge branch '3.x'

1 files changed, 4 insertions, 3 deletions

diff --git a/sphinx/environment/__init__.py b/sphinx/environment/__init__.py
index 2121b3ee4..28599c977 100644
--- a/sphinx/environment/__init__.py
+++ b/sphinx/environment/__init__.py
@@ -10,6 +10,7 @@
 
 import os
 import pickle
+import posixpath
 from collections import defaultdict
 from copy import copy
 from datetime import datetime
@@ -340,9 +341,9 @@ class BuildEnvironment:
             docdir = path.dirname(self.doc2path(docname or self.docname,
                                                 base=None))
             rel_fn = path.join(docdir, filename)
-        # the path.abspath() might seem redundant, but otherwise artifacts
-        # such as ".." will remain in the path
-        return rel_fn, path.abspath(path.join(self.srcdir, rel_fn))
+
+        return (posixpath.normpath(rel_fn),
+                path.normpath(path.join(self.srcdir, rel_fn)))
 
     @property
     def found_docs(self) -> Set[str]: