diff --git a/doc/install/OSX.mdwn b/doc/install/OSX.mdwn index 261959c7b1..3f9c3a7909 100644 --- a/doc/install/OSX.mdwn +++ b/doc/install/OSX.mdwn @@ -1,3 +1,14 @@ +## using Brew + +
+sudo brew update +sudo brew install haskell-platform git ossp-uuid md5sha1sum coreutils pcre +cabal update +cabal install git-annex --bindir=$HOME/bin ++ +## using MacPorts + Install the Haskell Platform from [[http://hackage.haskell.org/platform/mac.html]]. The version provided by Macports is too old to work with current versions of git-annex. Then execute @@ -11,6 +22,8 @@ sudo cabal update cabal install git-annex --bindir=$HOME/bin +## PATH setup + Do not forget to add to your PATH variable your ~/bin folder. In your .bashrc, for example:
PATH=~/bin:/usr/bin/local:$PATH diff --git a/doc/install/OSX/comment_2_25552ff2942048fafe97d653757f1ad6._comment b/doc/install/OSX/comment_2_25552ff2942048fafe97d653757f1ad6._comment index 62ee109109..8d7010a1b9 100644 --- a/doc/install/OSX/comment_2_25552ff2942048fafe97d653757f1ad6._comment +++ b/doc/install/OSX/comment_2_25552ff2942048fafe97d653757f1ad6._comment @@ -4,4 +4,5 @@ date="2012-07-24T15:09:29Z" content=""" I've moved some outdated comments about installing on OSX to [[old_comments]]. +And also moved away some comments that helped build the instructions above. """]] diff --git a/doc/install/OSX/comment_4_d513e21512a9b207983d38abf348d00f._comment b/doc/install/OSX/comment_4_d513e21512a9b207983d38abf348d00f._comment deleted file mode 100644 index 049f7e9624..0000000000 --- a/doc/install/OSX/comment_4_d513e21512a9b207983d38abf348d00f._comment +++ /dev/null @@ -1,16 +0,0 @@ -[[!comment format=mdwn - username="https://www.google.com/accounts/o8/id?id=AItOawm_-2XlXNyd6cCLI4n_jaBNqVUOWwJquko" - nickname="David" - subject="installing via homebrew" - date="2012-09-05T11:11:55Z" - content=""" -I had to: - - cabal update - -before: - - cabal install git-annex - - -"""]] diff --git a/doc/install/OSX/comment_1_0a1760bf0db1f1ba89bdb4c62032f631._comment b/doc/install/OSX/old_comments/comment_1_0a1760bf0db1f1ba89bdb4c62032f631._comment similarity index 100% rename from doc/install/OSX/comment_1_0a1760bf0db1f1ba89bdb4c62032f631._comment rename to doc/install/OSX/old_comments/comment_1_0a1760bf0db1f1ba89bdb4c62032f631._comment diff --git a/doc/install/OSX/comment_3_733147cebe501c60f2141b711f1d7f24._comment b/doc/install/OSX/old_comments/comment_3_733147cebe501c60f2141b711f1d7f24._comment similarity index 100% rename from doc/install/OSX/comment_3_733147cebe501c60f2141b711f1d7f24._comment rename to doc/install/OSX/old_comments/comment_3_733147cebe501c60f2141b711f1d7f24._comment