diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-09 13:11:56 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-09 13:11:56 -0400 |
| commit | 425bc1107aebdb701cdcee44da731dd918cd470d (patch) | |
| tree | 25bcacb37277b70aa7bd0caaf0fe7c3edc665653 /Utility/LinuxMkLibs.hs | |
| parent | 20c7644a4d85434cf49840ea92fca0c723710c72 (diff) | |
revert parentDir change
Reverts 2bba5bc22d049272d3328bfa6c452d3e2e50e86c
Unfortunately, this caused breakage on Windows, and possibly elsewhere,
because parentDir and takeDirectory do not behave the same when there is a
trailing directory separator.
Diffstat (limited to 'Utility/LinuxMkLibs.hs')
| -rw-r--r-- | Utility/LinuxMkLibs.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Utility/LinuxMkLibs.hs b/Utility/LinuxMkLibs.hs index 2482a9bca..aaafd8d0c 100644 --- a/Utility/LinuxMkLibs.hs +++ b/Utility/LinuxMkLibs.hs @@ -29,13 +29,13 @@ installLib installfile top lib = ifM (doesFileExist lib) ( do installfile top lib checksymlink lib - return $ Just $ takeDirectory lib + return $ Just $ parentDir lib , return Nothing ) where checksymlink f = whenM (isSymbolicLink <$> getSymbolicLinkStatus (inTop top f)) $ do l <- readSymbolicLink (inTop top f) - let absl = absPathFrom (takeDirectory f) l + let absl = absPathFrom (parentDir f) l target <- relPathDirToFile (takeDirectory f) absl installfile top absl nukeFile (top ++ f) |