diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-04-29 14:26:13 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-29 14:26:13 -0400 |
| commit | 681e4dbbcb880e8e2526519fc58d4f2994a41577 (patch) | |
| tree | 58f0951f6fc4fc7c534b7c293592386b7575164a /src/Utility/LinuxMkLibs.hs | |
| parent | 960745b95e96e3d276e275554584c9bd13565f5b (diff) | |
propellor spin
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) |