X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2FinstallPackage%2FinstallPackage.hs;h=9ec728259223c73648942958a49ae750d32cd2ab;hb=5a4c6ef6e909fbd978ff81bb3453489e884d1885;hp=f36fd233de0ff33ad1c42eabaec1043a9b43ee25;hpb=9520de572cb08531b67b07569bd30c3ed27d9f94;p=ghc-hetmet.git diff --git a/utils/installPackage/installPackage.hs b/utils/installPackage/installPackage.hs index f36fd23..9ec7282 100644 --- a/utils/installPackage/installPackage.hs +++ b/utils/installPackage/installPackage.hs @@ -39,11 +39,11 @@ parseArgs :: [String] Bool, -- enable shell wrappers? Bool) -- strip exe? parseArgs = f normal defaultDistPref False True - where f v dp esw strip (('-':'v':val):args) + where f _ dp esw strip (('-':'v':val):args) = f (readEOrFail flagToVerbosity val) dp esw strip args f v _ esw strip ("--distpref":dp:args) = f v dp esw strip args f v dp _ strip ("--enable-shell-wrappers":args) = f v dp True strip args - f v dp esw strip ("--disable-executable-stripping":args) = f v dp esw False args + f v dp esw _ ("--disable-executable-stripping":args) = f v dp esw False args f v dp esw strip [] = (v, dp, esw, strip) f _ _ _ _ args = error ("Bad arguments: " ++ show args) @@ -59,11 +59,13 @@ doInstall verbosity distPref enableShellWrappers strip do let userHooks = simpleUserHooks copyto = if null destdir then NoCopyDest else CopyTo destdir copyFlags = defaultCopyFlags { + copyDistPref = toFlag distPref, copyUseWrapper = toFlag enableShellWrappers, copyDest = toFlag copyto, copyVerbosity = toFlag verbosity } registerFlags = defaultRegisterFlags { + regDistPref = toFlag distPref, regPackageDB = toFlag GlobalPackageDB, regVerbosity = toFlag verbosity, regGenScript = toFlag $ False,