summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Options.hs3
-rw-r--r--doc/install/OSX.mdwn6
2 files changed, 5 insertions, 4 deletions
diff --git a/Options.hs b/Options.hs
index f8dbfb6bc..7f78f44f6 100644
--- a/Options.hs
+++ b/Options.hs
@@ -40,4 +40,5 @@ commonOptions =
setfast v = Annex.changeState $ \s -> s { Annex.fast = v }
setquiet v = Annex.changeState $ \s -> s { Annex.quiet = v }
setforcebackend v = Annex.changeState $ \s -> s { Annex.forcebackend = Just v }
- setdebug = liftIO $ updateGlobalLogger "" $ setLevel DEBUG
+ setdebug = liftIO $ updateGlobalLogger rootLoggerName $
+ setLevel DEBUG
diff --git a/doc/install/OSX.mdwn b/doc/install/OSX.mdwn
index 46a285e13..a6afd408b 100644
--- a/doc/install/OSX.mdwn
+++ b/doc/install/OSX.mdwn
@@ -1,12 +1,12 @@
<pre>
-sudo port install haskell-platform git-core ossp-uuid md5sha1sum coreutils
+sudo port install haskell-platform git-core ossp-uuid md5sha1sum coreutils pcre
sudo cabal update
sudo cabal install missingh
sudo cabal install utf8-string
-sudo port install pcre
sudo cabal install pcre-light
sudo cabal install quickcheck
-sudo cabal install SHA
+sudo cabal install SHA
+sudo cabal install dataenc
# optional: this will enable the gnu tools, (to give sha224sum etc..., it does not override the BSD userland)
export PATH=$PATH:/opt/local/libexec/gnubin