diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-05-06 14:29:12 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-06 14:29:12 -0400 |
| commit | 9ec4b33dbb62e42b8d284d1aeddf32a395fd7cc0 (patch) | |
| tree | b9067a945a430af4868be1a0fcf052db5c4cd5fc /src/Utility/LinuxMkLibs.hs | |
| parent | b4877efea5375cb83951d6dd1d3dbf9d70208cf8 (diff) | |
| parent | 160eff0eb7ebbb2da2c3864dbe83bf7db76c8bb6 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Utility/LinuxMkLibs.hs')
| -rw-r--r-- | src/Utility/LinuxMkLibs.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Utility/LinuxMkLibs.hs b/src/Utility/LinuxMkLibs.hs index 6074ba26..db64d123 100644 --- a/src/Utility/LinuxMkLibs.hs +++ b/src/Utility/LinuxMkLibs.hs @@ -1,6 +1,6 @@ {- Linux library copier and binary shimmer - - - Copyright 2013 Joey Hess <joey@kitenet.net> + - Copyright 2013 Joey Hess <id@joeyh.name> - - License: BSD-2-clause -} @@ -29,14 +29,14 @@ 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 target = relPathDirToFile (takeDirectory f) absl + let absl = absPathFrom (parentDir f) l + target <- relPathDirToFile (takeDirectory f) absl installfile top absl nukeFile (top ++ f) createSymbolicLink target (inTop top f) |