@@ -83,13 +83,11 @@ isFreestanding flags =
8383-- -----------------------------------------------------------------------------
8484-- Clean
8585
86−idrisClean _ flags _ _ = do
87− cleanStdLib
86+idrisClean _ flags _ _ = cleanStdLib
8887 where
8988 verbosity = S.fromFlag $ S.cleanVerbosity flags
9089
91− cleanStdLib = do
92− makeClean "libs"
90+ cleanStdLib = makeClean "libs"
9391
9492 makeClean dir = make verbosity [ "-C", dir, "clean", "IDRIS=idris" ]
9593
@@ -108,7 +106,7 @@ generateVersionModule verbosity dir release = do
108106 hash <- gitHash
109107 let versionModulePath = dir </> "Version_idris" Px.<.> "hs"
110108 putStrLn $ "Generating " ++ versionModulePath ++
111− if release then " for release" else (" for prerelease " ++ hash)
109+ if release then " for release" else " for prerelease " ++ hash
112110 createDirectoryIfMissingVerbose verbosity True dir
113111 rewriteFile versionModulePath (versionModuleContents hash)
114112
@@ -120,7 +118,7 @@ generateVersionModule verbosity dir release = do
120118
121119-- Generate a module that contains the lib path for a freestanding Idris
122120generateTargetModule verbosity dir targetDir = do
123− absPath <- return $ isAbsolute targetDir
121+ let absPath = isAbsolute targetDir
124122 let targetModulePath = dir </> "Target_idris" Px.<.> "hs"
125123 putStrLn $ "Generating " ++ targetModulePath
126124 createDirectoryIfMissingVerbose verbosity True dir
@@ -155,15 +153,15 @@ generateToolchainModule verbosity srcDir toolDir = do
155153idrisConfigure _ flags _ local = do
156154 configureRTS
157155 generateVersionModule verbosity (autogenModulesDir local) (isRelease (configFlags local))
158− if (isFreestanding $ configFlags local)
159− then (do
156+ if isFreestanding $ configFlags local
157+ then do
160158 toolDir <- lookupEnv "IDRIS_TOOLCHAIN_DIR"
161159 generateToolchainModule verbosity (autogenModulesDir local) toolDir
162160 targetDir <- lookupEnv "IDRIS_LIB_DIR"
163161 case targetDir of
164162 Just d -> generateTargetModule verbosity (autogenModulesDir local) d
165163 Nothing -> error $ "Trying to build freestanding without a target directory."
166− ++ " Set it by defining IDRIS_LIB_DIR.")
164+ ++ " Set it by defining IDRIS_LIB_DIR."
167165 else
168166 generateToolchainModule verbosity (autogenModulesDir local) Nothing
169167 where
@@ -179,7 +177,7 @@ idrisConfigure _ flags _ local = do
179177idrisPreSDist args flags = do
180178 let dir = S.fromFlag (S.sDistDirectory flags)
181179 let verb = S.fromFlag (S.sDistVerbosity flags)
182− generateVersionModule verb ("src") True
180+ generateVersionModule verb "src" True
183181 generateTargetModule verb "src" "./libs"
184182 generateToolchainModule verb "src" Nothing
185183 preSDist simpleUserHooks args flags
@@ -257,7 +255,7 @@ idrisInstall verbosity copy pkg local = unless (execOnly (configFlags local)) $
257255 makeInstall "rts" target'
258256
259257 installManPage = do
260− let mandest = (mandir $ L.absoluteInstallDirs pkg local copy) ++ "/man1"
258+ let mandest = mandir (L.absoluteInstallDirs pkg local copy) ++ "/man1"
261259 notice verbosity $ unwords ["Copying man page to", mandest]
262260 installOrdinaryFiles verbosity mandest [("man", "idris.1")]
263261
@@ -281,6 +279,6 @@ main = defaultMainWithHooks $ simpleUserHooks
281279 , postInst = \_ flags pkg local ->
282280 idrisInstall (S.fromFlag $ S.installVerbosity flags)
283281 NoCopyDest pkg local
284− , preSDist = idrisPreSDist --do { putStrLn (show args) ; putStrLn (show flags) ; return emptyHookedBuildInfo }
282+ , preSDist = idrisPreSDist
285283 , postSDist = idrisPostSDist
286284 }