diff options
Diffstat (limited to 'Build/Standalone.hs')
| -rw-r--r-- | Build/Standalone.hs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Build/Standalone.hs b/Build/Standalone.hs index 2a6c04e6d..a3a4bac48 100644 --- a/Build/Standalone.hs +++ b/Build/Standalone.hs @@ -26,6 +26,9 @@ progDir topdir = topdir progDir topdir = topdir </> "bin" #endif +extraProgDir :: FilePath -> FilePath +extraProgDir topdir = topdir </> "extra" + installProg :: FilePath -> FilePath -> IO (FilePath, FilePath) installProg dir prog = searchPath prog >>= go where @@ -41,7 +44,9 @@ main = getArgs >>= go where go [] = error "specify topdir" go (topdir:_) = do - let dir = progDir topdir - createDirectoryIfMissing True dir - installed <- forM bundledPrograms $ installProg dir - writeFile "tmp/standalone-installed" (show installed) + installed <- forM + [ (progDir topdir, preferredBundledPrograms) + , (extraProgDir topdir, extraBundledPrograms) ] $ \(dir, progs) -> do + createDirectoryIfMissing True dir + forM progs $ installProg dir + writeFile "tmp/standalone-installed" (show (concat installed)) |