move manual cabal install into its own page, and simplify it

2 files changed, 18 insertions, 11 deletions

diff --git a/doc/install.mdwn b/doc/install.mdwn
index 33426d637..a02d9d2c7 100644
--- a/doc/install.mdwn
+++ b/doc/install.mdwn
@@ -16,6 +16,9 @@ As a haskell package, git-annex can be installed using cabal. For example:
 
 	cabal install git-annex --bindir=$HOME/bin
 
+The above downloads the latest release. Alternatively, you can [[download]]
+it yourself and [[manually_build_with_cabal|install/cabal]].
+
 ## Installation by hand
 
 To build and use git-annex, you will need:
@@ -50,14 +53,3 @@ To build and use git-annex, you will need:
   * [ikiwiki](http://ikiwiki.info) (optional; used to build the docs)
 
 Then just [[download]] git-annex and run: `make; make install`
-
-## Installation by hand using cabal / Setup.hs
-
-You can fetch the dependencies using `cabal install`. Then, you can build git-annex by running:
-
-    runhaskell Setup.hs configure --user
-    runhaskell Setup.hs build
-    runhaskell Setup.hs install
-
-The `--user` option configures the build so that it uses the packages you already have in `~/.cabal`. Binaries
-will be installed in `~/.cabal/bin`, you'll need it in your PATH.
diff --git a/doc/install/cabal.mdwn b/doc/install/cabal.mdwn
new file mode 100644
index 000000000..fe7b025e1
--- /dev/null
+++ b/doc/install/cabal.mdwn
@@ -0,0 +1,15 @@
+As a haskell package, git-annex can be installed using cabal. For example:
+
+	cabal update
+        cabal install git-annex --bindir=$HOME/bin
+
+The above downloads the latest release and installs it into a ~/bin/
+directory, which you can put in your PATH.
+
+But maybe you want something newer (or older). Then [[download]] the version
+you want, and use cabal as follows inside its source tree:
+
+	cabal update
+	cabal configure
+	cabal build
+	cabal install --bindir=$HOME/bin