diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-06 17:41:46 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-06 17:58:43 -0400 |
| commit | a1e76e7fdcfcd17a690bd49e4a29f88ca83e82b1 (patch) | |
| tree | 36ceb8f465e4d9cddf5bc87be28067fc4d4e2186 /Utility/Path.hs | |
| parent | 085c06857947b84356fbe7b26e875e32aad80946 (diff) | |
fix windows code again (argh)
Diffstat (limited to 'Utility/Path.hs')
| -rw-r--r-- | Utility/Path.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Utility/Path.hs b/Utility/Path.hs index 78d359bef..c3a1084ff 100644 --- a/Utility/Path.hs +++ b/Utility/Path.hs @@ -42,7 +42,7 @@ absNormPath :: FilePath -> FilePath -> Maybe FilePath #ifndef mingw32_HOST_OS absNormPath dir path = MissingH.absNormPath dir path #else -absNormPath dir path = MissingH.absNormPath dir path +absNormPath dir path = Just $ combine dir path #endif {- On Windows, this converts the paths to unix-style, in order to run @@ -50,7 +50,6 @@ absNormPath dir path = MissingH.absNormPath dir path #ifndef mingw32_HOST_OS absNormPathUnix dir path = MissingH.absNormPath dir path #else -absNormPathUnix dir path = Just $ combine dir path absNormPathUnix dir path = MissingH.absNormPath (fromdos dir) (fromdos path) where fromdos = replace "\\" "/" |