summaryrefslogtreecommitdiff
path: root/doc/install.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-03-30 01:32:05 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-03-30 01:32:05 -0400
commit9c96d86502c521cf78228f816e33ac456fb2ee59 (patch)
tree1dfdc771e6e6d02162f996c0d96551a0cfbba9c7 /doc/install.mdwn
parentdef137b0cc0c86d9cd976c11b59f7ba0669c0735 (diff)
nasty hack to build when hS3 is not available
So, it would be nicer to just use Cabal and take advantage of its conditional compilation support. But, Cabal seems to lack good support for a package with an internal library that is used by multiple executables. It wants to build everything twice or more. That's too slow for me. Anyway, fairly soon, I expect to upgrade hS3 to a requirment, and I can just revert this.
Diffstat (limited to 'doc/install.mdwn')
-rw-r--r--doc/install.mdwn8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/install.mdwn b/doc/install.mdwn
index 7b2c536c9..70ab8e30b 100644
--- a/doc/install.mdwn
+++ b/doc/install.mdwn
@@ -13,17 +13,17 @@ To build and use git-annex, you will need:
* 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>
-* hS3: <http://hackage.haskell.org/package/hS3>
+* hS3 <http://hackage.haskell.org/package/hS3> (optional, but recommended)
* `uuid`: <http://www.ossp.org/pkg/lib/uuid/>
(or uuidgen from util-linux)
* `xargs`: <http://savannah.gnu.org/projects/findutils/>
* `rsync`: <http://rsync.samba.org/>
* `curl` : <http://http://curl.haxx.se/> (optional, but recommended)
* `sha1sum`: <ftp://ftp.gnu.org/gnu/coreutils/> (optional, but recommended)
-* Then just [[download]] git-annex and run: `make; make install`
+* [Ikiwiki](http://ikiwiki.info) is needed to build the documentation,
+ but that will be skipped if it is not installed.
-([Ikiwiki](http://ikiwiki.info) is needed to build the documentation,
-but that will be skipped if it is not installed.)
+Then just [[download]] git-annex and run: `make; make install`
Additionally, to run the test suite (via `make test`), you will need: