diff options
| author |  Adam Chlipala <adam@chlipala.net> | 2015-03-08 10:55:05 -0400 |
|---|---|---|
| committer | Adam Chlipala <adam@chlipala.net> | 2015-03-08 10:55:05 -0400 |
| commit | e0c9c2835156aedd059fd24d69c7ee9ae81a81c6 (patch) | |
| tree | f6193aa0371d90bba563c11cb263f4be7ccb0704 | |
| parent | 85e68b2124e33f5b005dd2bf2206a0e12b46073c (diff) | |
Fix interpretation of 'file' argument paths
| -rw-r--r-- | src/settings.sml | 2 | ||||
| -rw-r--r-- | tests/files.urp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/settings.sml b/src/settings.sml index 19ee0b4a..c9b022fd 100644 --- a/src/settings.sml +++ b/src/settings.sml @@ -867,7 +867,7 @@ fun setFilePath path = filePath := path fun addFile {Uri, LoadFromFilename} = let - val path = OS.Path.joinDirFile {dir = !filePath, file = LoadFromFilename} + val path = OS.Path.mkAbsolute {relativeTo = !filePath, path = LoadFromFilename} in case SM.find (!files, Uri) of SOME (path', _) => diff --git a/tests/files.urp b/tests/files.urp index 100992e5..3683f1a8 100644 --- a/tests/files.urp +++ b/tests/files.urp @@ -1,6 +1,6 @@ rewrite all Files/* file /hello_world.txt hello.txt file /img/web.png web.png -file /files.urp files.urp +file /files.urp ./files.urp files |