diff options
author | 2013-02-11 11:47:53 -0400 | |
---|---|---|
committer | 2013-02-11 11:47:53 -0400 | |
commit | 69cb6af4b7f6b16a69734d75ef5583bd2797c173 (patch) | |
tree | 2342a1c3b8ced54e0cde32afce963d643294a718 /doc | |
parent | 3ce402a4c63e4ac04ab788cfd3ad8ea964b402ef (diff) |
Now uses the Haskell Glob library, rather than pcre-light, avoiding the need to install libpcre. Currently done only for Cabal or when the Makefile is made to use -DWITH_GLOB
Diffstat (limited to 'doc')
-rw-r--r-- | doc/install/Fedora.mdwn | 2 | ||||
-rw-r--r-- | doc/install/OSX.mdwn | 7 | ||||
-rw-r--r-- | doc/install/ScientificLinux5.mdwn | 12 | ||||
-rw-r--r-- | doc/install/fromscratch.mdwn | 2 |
4 files changed, 4 insertions, 19 deletions
diff --git a/doc/install/Fedora.mdwn b/doc/install/Fedora.mdwn index a150dbc38..d7d07715c 100644 --- a/doc/install/Fedora.mdwn +++ b/doc/install/Fedora.mdwn @@ -9,7 +9,7 @@ Should be as simple as: `yum install git-annex` Older version? Here's an installation recipe for Fedora 14 through 15. <pre> -sudo yum install ghc cabal-install pcre-devel +sudo yum install ghc cabal-install git clone git://git-annex.branchable.com/ git-annex cd git-annex git checkout ghc7.0 diff --git a/doc/install/OSX.mdwn b/doc/install/OSX.mdwn index e9e2a044b..10735a7d0 100644 --- a/doc/install/OSX.mdwn +++ b/doc/install/OSX.mdwn @@ -24,7 +24,7 @@ the app for OSX Lion. <pre> brew update -brew install haskell-platform git ossp-uuid md5sha1sum coreutils pcre libgsasl gnutls libidn libgsasl pkg-config libxml2 +brew install haskell-platform git ossp-uuid md5sha1sum coreutils libgsasl gnutls libidn libgsasl pkg-config libxml2 brew link libxml2 cabal update PATH=$HOME/bin:$PATH @@ -38,10 +38,7 @@ The version provided by Macports is too old to work with current versions of git Then execute <pre> -sudo port install git-core ossp-uuid md5sha1sum coreutils pcre gnutls libxml2 libgsasl pkgconfig - -sudo ln -s /opt/local/include/pcre.h /usr/include/pcre.h # This is hack that allows pcre-light to find pcre - +sudo port install git-core ossp-uuid md5sha1sum coreutils gnutls libxml2 libgsasl pkgconfig sudo cabal update PATH=$HOME/bin:$PATH cabal install c2hs git-annex --bindir=$HOME/bin diff --git a/doc/install/ScientificLinux5.mdwn b/doc/install/ScientificLinux5.mdwn index 15ffb928b..23dca311c 100644 --- a/doc/install/ScientificLinux5.mdwn +++ b/doc/install/ScientificLinux5.mdwn @@ -29,23 +29,11 @@ don't want things to be system wide) $ export PATH=/usr/hs/bin:$PATH -On SL5 pcre is at version 6.6 which is far too old for one of the -dependancies that git-annex requires. Therefore the user must install -an updated version of _pcre_ either from source or another method, I -chose to install it from source and by hand into /usr/local - - $ wget http://sourceforge.net/projects/pcre/files/pcre/8.30/pcre-8.30.tar.gz/download - $ tar zxvf pcre-8.30.tar.gz - $ cd pcre-8.30 - $ ./configure - $ make && make install - Once the packages are installed and are in your execution path, using cabal to configure and build git-annex just makes life easier, it should install all the needed dependancies. $ cabal update - $ cabal install pcre-light --extra-include-dirs=/usr/local/include $ git clone git://git.kitenet.net/git-annex $ cd git-annex $ make git-annex.1 diff --git a/doc/install/fromscratch.mdwn b/doc/install/fromscratch.mdwn index bde5b9a89..386776f6b 100644 --- a/doc/install/fromscratch.mdwn +++ b/doc/install/fromscratch.mdwn @@ -5,7 +5,6 @@ quite a lot. * [The Haskell Platform](http://haskell.org/platform/) (GHC 7.4 or newer) * [mtl](http://hackage.haskell.org.package/mtl) (2.1.1 or newer) * [MissingH](http://github.com/jgoerzen/missingh/wiki) - * [pcre-light](http://hackage.haskell.org/package/pcre-light) * [utf8-string](http://hackage.haskell.org/package/utf8-string) * [SHA](http://hackage.haskell.org/package/SHA) * [dataenc](http://hackage.haskell.org/package/dataenc) @@ -21,6 +20,7 @@ quite a lot. * [DAV](http://hackage.haskell.org/package/DAV) (optional) * [SafeSemaphore](http://hackage.haskell.org/package/SafeSemaphore) * [UUID](http://hackage.haskell.org/package/uuid) + * [Glob](http://hackage.haskell.org/package/Glob) * Optional haskell stuff, used by the [[assistant]] and its webapp (edit Makefile to disable) * [stm](http://hackage.haskell.org/package/stm) (version 2.3 or newer) |