Revert "avoid pulling in unneeded dependencies when the assistant is disabled"

Cabal does not seem to have a way to check if flag A is set and then, if
flag B is set, add a dep. Instead, it makes flag B get unset if the
dep is not available.

1 files changed, 14 insertions, 11 deletions

diff --git a/doc/install/cabal.mdwn b/doc/install/cabal.mdwn
index 0f381472d..383978d36 100644
--- a/doc/install/cabal.mdwn
+++ b/doc/install/cabal.mdwn
@@ -1,22 +1,25 @@
 As a haskell package, git-annex can be installed using cabal.
 
-Start by installing the [Haskell Platform](http://hackage.haskell.org/platform/),
-and then:
+Start by installing the [Haskell Platform](http://hackage.haskell.org/platform/).
+
+## minimal build
+
+This builds git-annex without some features that require C libraries, that
+can be harder to get installed. This is plenty to get started using it,
+although it does not include the assistant or webapp.
 
 	cabal update
 	PATH=$HOME/bin:$PATH
-	cabal install git-annex -f-assistant --bindir=$HOME/bin
-
-The above downloads the latest release and installs it into a ~/bin/
-directory, which you can put in your PATH.
+	cabal install git-annex --bindir=$HOME/bin -f"-assistant -webapp -webdav -pairing -xmpp -dns"
 
-## building in the assistant and webapp
+## full build
 
-The above builds git-annex without the git-annex assistant and webapp. To
-build with those features enabled, you will need to install several C
-libraries and their headers, including libgnutls, libgsasl, libxml2, and
-zlib. Then run:
+To build with all features enabled, including the assistant and webapp,
+you will need to install several C libraries and their headers,
+including libgnutls, libgsasl, libxml2, and zlib. Then run:
 
+	cabal update
+	PATH=$HOME/bin:$PATH
 	cabal install c2hs --bindir=$HOME/bin
 	cabal install git-annex --bindir=$HOME/bin