diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-03-12 20:09:31 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-03-12 20:09:31 -0400 |
| commit | bc60edb50a41a326e64ccd25a36ac27215ef4b9e (patch) | |
| tree | 7e3849d123da0dda038d2f5e3d88025635beb444 /src/Propellor/Shim.hs | |
| parent | 4f101f8560e29958b08306c86a1b8ca34e8a6a0c (diff) | |
| parent | 9292cee1aa7967a0afe6d45f58a6d429d1b56b55 (diff) | |
Merge branch 'joeyconfig'
Conflicts:
privdata.joey/privdata.gpg
Diffstat (limited to 'src/Propellor/Shim.hs')
| -rw-r--r-- | src/Propellor/Shim.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Shim.hs b/src/Propellor/Shim.hs index e1ea2825..5fc1ea05 100644 --- a/src/Propellor/Shim.hs +++ b/src/Propellor/Shim.hs @@ -34,7 +34,7 @@ setup propellorbin propellorbinpath dest = checkAlreadyShimmed propellorbin $ do fromMaybe (error "cannot find ld-linux linker") $ headMaybe $ filter ("ld-linux" `isInfixOf`) libs' let linkersym = takeDirectory linker </> takeFileName propellorbin - createSymbolicLink linkersym (takeFileName linker) + createSymbolicLink (takeFileName linker) linkersym let gconvdir = (dest ++) $ takeDirectory $ fromMaybe (error "cannot find gconv directory") $ |